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.37 by root, Thu Jun 15 15:47:36 2006 UTC vs.
Revision 1.105 by root, Tue Apr 24 01:13:15 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}
87 113
114sub _stat_numdiff {
115 my ($self, $name, $old, $new) = @_;
88 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);
89 182
90sub stats_update { 183sub stats_update {
91 my ($self, $stats) = @_; 184 my ($self, $stats) = @_;
92 185
93 if (my $exp = $stats->{+CS_STAT_EXP64}) { 186 my $prev = $self->{prev_stats} || { };
94 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;
95 $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);
96 if exists $self->{prev_exp} && $diff;
97 $self->{prev_exp} = $exp;
98 } 199 }
99 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
100 ::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 }
101} 352}
102 353
103sub user_send { 354sub user_send {
104 my ($self, $command) = @_; 355 my ($self, $command) = @_;
105 356
357 $self->{record}->($command)
106 if ($self->{record}) { 358 if $self->{record};
107 push @{$self->{record}}, $command;
108 }
109 359
110 $self->logprint ("send: ", $command); 360 $self->logprint ("send: ", $command);
111 $self->send_command ($command); 361 $self->send_command ($command);
112 ::status $command; 362 ::status ($command);
113} 363}
114 364
115sub start_record { 365sub record {
116 my ($self) = @_; 366 my ($self, $cb) = @_;
117 367
118 $self->{record} = []; 368 $self->{record} = $cb;
119}
120
121sub stop_record {
122 my ($self) = @_;
123 return delete $self->{record};
124} 369}
125 370
126sub map_scroll { 371sub map_scroll {
127 my ($self, $dx, $dy) = @_; 372 my ($self, $dx, $dy) = @_;
128 373
… …
130} 375}
131 376
132sub feed_map1a { 377sub feed_map1a {
133 my ($self, $data) = @_; 378 my ($self, $data) = @_;
134 379
135 $self->{map}->map1a_update ($data); 380 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
136 $self->{map_widget}->update; 381 $self->{map_widget}->update;
137} 382}
138 383
139sub magicmap { 384sub magicmap {
140 my ($self, $w, $h, $x, $y, $data) = @_; 385 my ($self, $w, $h, $x, $y, $data) = @_;
… …
149 or return; 394 or return;
150 395
151 my ($hash, $x, $y, $w, $h) = @$map_info; 396 my ($hash, $x, $y, $w, $h) = @$map_info;
152 397
153 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 398 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
154 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 399 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
155 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 400 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
156} 401}
157 402
158sub map_clear { 403sub map_clear {
159 my ($self) = @_; 404 my ($self) = @_;
… …
163 408
164 $self->{map}->clear; 409 $self->{map}->clear;
165 delete $self->{map_widget}{magicmap}; 410 delete $self->{map_widget}{magicmap};
166} 411}
167 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}
168 434
169sub load_map($$$) { 435sub load_map($$$) {
170 my ($self, $hash, $x, $y) = @_; 436 my ($self, $hash, $x, $y) = @_;
171 437
172 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) {
173 $data = Compress::LZF::decompress $data; 446 $data = Compress::LZF::decompress $data;
174 #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#
175 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
176 my $data = $self->{tilecache}->get ($id)
177 or next;
178 448
179 $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;
180 } 452 }
181 } 453 };
182} 454}
183 455
184# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 456# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
185# (server resource,s latency, bandwidth), so this hack is warranted. 457# (server resource,s latency, bandwidth), so this hack is warranted.
186# 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
… …
250 522
251 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 523 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
252 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 524 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
253 525
254 } else { 526 } else {
527 my $gen = $self->{map_change_gen};
255 $self->send_mapinfo ("spatial $path$tile", sub { 528 $self->send_mapinfo ("spatial $path$tile", sub {
529 return unless $gen == $self->{map_change_gen};
530
256 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 531 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
257 532
258 return if $mode ne "spatial"; 533 return if $mode ne "spatial";
259 534
260 $x += $self->{map}->ox; 535 $x += $self->{map}->ox;
… …
274 549
275sub map_change { 550sub map_change {
276 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 551 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
277 552
278 $self->flush_map; 553 $self->flush_map;
554
555 ++$self->{map_change_gen};
279 556
280 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 557 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
281 558
282 my $mapmapw = $self->{mapmap}->{w}; 559 my $mapmapw = $self->{mapmap}->{w};
283 my $mapmaph = $self->{mapmap}->{h}; 560 my $mapmaph = $self->{mapmap}->{h};
… …
300 $self->load_map ($hash, $x, $y); 577 $self->load_map ($hash, $x, $y);
301 $self->flood_fill (0, 0, 0, "", $hash, $flags); 578 $self->flood_fill (0, 0, 0, "", $hash, $flags);
302} 579}
303 580
304sub 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 {
305 my ($self, $facenum, $face) = @_; 606 my ($self, $facenum, $face) = @_;
306 607
307 my $hash = "$face->{chksum},$face->{name}"; 608 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
308
309 my $id = $self->{facemap}->get ($hash);
310
311 unless ($id) {
312 # create new id for face
313 # I love transactions
314 for (1..100) {
315 my $txn = $CFClient::DB_ENV->txn_begin;
316 my $status = $self->{facemap}->db_get (id => $id);
317 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
318 $id = ($id || 64) + 1;
319 if ($self->{facemap}->put (id => $id) == 0
320 && $self->{facemap}->put ($hash => $id) == 0) {
321 $txn->txn_commit;
322
323 goto gotid;
324 }
325 }
326 $txn->txn_abort;
327 }
328
329 CFClient::fatal "maximum number of transaction retries reached - database problems?";
330 }
331
332gotid:
333 $face->{id} = $id;
334 $self->{map}->set_face ($facenum => $id);
335 $self->{faceid}[$facenum] = $id;#d#
336
337 my $face = $self->{tilecache}->get ($id);
338
339 if ($face) {
340 #$self->face_prefetch;
341 $face
342 } else {
343 my $tex = $self->{noface};
344 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
345 undef
346 };
347}
348
349sub face_update {
350 my ($self, $facenum, $face) = @_;
351
352 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
353
354 $self->set_texture ($face->{id} => delete $face->{image});
355} 609}
356 610
357sub set_texture { 611sub set_texture {
358 my ($self, $id, $data) = @_; 612 my ($self, $id, $data) = @_;
359 613
360 $self->{texture}[$id] ||= do { 614 $self->{texture}[$id] = my $tex =
361 my $tex =
362 new_from_image CFClient::Texture 615 new_from_image CFPlus::Texture
363 $data, minify => 1, mipmap => 1; 616 $data, minify => 1, mipmap => 1;
364 617
365 $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}});
366 $self->{map_widget}->update; 619 $self->{map_widget}->update;
367
368 $tex
369 };
370} 620}
371 621
372sub sound_play { 622sub sound_play {
373 my ($self, $x, $y, $soundnum, $type) = @_; 623 my ($self, $x, $y, $soundnum, $type) = @_;
374 624
… …
384 $LAST_QUERY = $prompt; 634 $LAST_QUERY = $prompt;
385 635
386 $self->{query}-> ($self, $flags, $prompt); 636 $self->{query}-> ($self, $flags, $prompt);
387} 637}
388 638
389sub drawinfo { 639our %NAME_TO_COLOR = (
390 my ($self, $color, $text) = @_; 640 black => 0,
641 white => 1,
642 darkblue => 2,
643 red => 3,
644 orange => 4,
645 lightblue => 5,
646 darkorange => 6,
647 green => 7,
648 darkgreen => 8,
649 grey => 9,
650 brown => 10,
651 yellow => 11,
652 tan => 12,
653);
391 654
392 my @color = ( 655our @CF_COLOR = (
393 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 656 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
394 [1.00, 1.00, 1.00], 657 [1.00, 1.00, 1.00],
395 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 658 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
396 [1.00, 0.00, 0.00], 659 [1.00, 0.00, 0.00],
397 [1.00, 0.54, 0.00], 660 [1.00, 0.54, 0.00],
398 [0.11, 0.56, 1.00], 661 [0.11, 0.56, 1.00],
399 [0.93, 0.46, 0.00], 662 [0.93, 0.46, 0.00],
400 [0.18, 0.54, 0.34], 663 [0.18, 0.54, 0.34],
401 [0.56, 0.73, 0.56], 664 [0.56, 0.73, 0.56],
402 [0.80, 0.80, 0.80], 665 [0.80, 0.80, 0.80],
403 [0.55, 0.41, 0.13], 666 [0.75, 0.61, 0.20],
404 [0.99, 0.77, 0.26], 667 [0.99, 0.77, 0.26],
405 [0.74, 0.65, 0.41], 668 [0.74, 0.65, 0.41],
406 ); 669);
407 670
671sub msg {
672 my ($self, $color, $type, $text, @extra) = @_;
673
674 if (my $cb = $self->{cb_msg}{$type}) {
675 $_->($self, $color, $type, $text, @extra) for values %$cb;
676 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
677 $type =~ s/-/_/g;
678 $self->{$type} = $text;
679 } else {
408 $self->logprint ("info: ", $text); 680 $self->logprint ("msg: ", $text);
681 return if $color < 0; # negative color == ignore if not understood
409 682
410 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 683 my $fg = $CF_COLOR[$color % @CF_COLOR];
411 684
412 # try to create single paragraphs of multiple lines sent by the server 685 ## try to create single paragraphs of multiple lines sent by the server
686 # no longer neecssary with TRT servers
413 $text =~ s/(?<=\S)\n(?=\w)/ /g; 687 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
414 688
415 $text = CFClient::UI::Label::escape $text; 689 ::message ({ fg => $fg, markup => $_ })
416 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 690 for split /\n/, $text;
417 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
418 691
419 $self->{logview}->add_paragraph ($color[$color],
420 join "\n", map "$time $_", split /\n/, $text);
421
422 $self->{statusbox}->add ($text, 692 $self->{statusbox}->add ($text,
423 group => $text, 693 group => $text,
424 fg => $color[$color], 694 fg => $fg,
425 timeout => $color >= 2 ? 60 : 10, 695 timeout => $color >= 2 ? 180 : 10,
426 tooltip_font => $::FONT_FIXED, 696 tooltip_font => $::FONT_FIXED,
427 ); 697 );
428} 698 }
429
430sub drawextinfo {
431 my ($self, $color, $type, $subtype, $message) = @_;
432
433 $self->drawinfo ($color, $message);
434} 699}
435 700
436sub spell_add { 701sub spell_add {
437 my ($self, $spell) = @_; 702 my ($self, $spell) = @_;
438 703
439 # try to create single paragraphs of multiple lines sent by the server 704 # try to create single paragraphs out of the multiple lines sent by the server
440 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 705 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
441 $spell->{message} =~ s/\n+$//; 706 $spell->{message} =~ s/\n+$//;
442 $spell->{message} ||= "Server did not provide a description for this spell."; 707 $spell->{message} ||= "Server did not provide a description for this spell.";
443 708
444 $::SETUP_SPELLS->add_spell ($spell); 709 $::SPELL_LIST->add_spell ($spell);
445 710
446 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 711 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
447 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 712 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
448} 713}
449 714
450sub spell_delete { 715sub spell_delete {
451 my ($self, $spell) = @_; 716 my ($self, $spell) = @_;
717
452 $::SETUP_SPELLS->remove_spell ($spell); 718 $::SPELL_LIST->remove_spell ($spell);
719}
720
721sub setup {
722 my ($self, $setup) = @_;
723
724 $self->{map_widget}->set_tilesize ($self->{tilesize});
725 $::MAP->resize ($self->{mapw}, $self->{maph});
453} 726}
454 727
455sub addme_success { 728sub addme_success {
456 my ($self) = @_; 729 my ($self) = @_;
457 730
458 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
459 my ($pom) = @_;
460
461 my %skill_help; 731 my %skill_help;
462 732
463 for my $head2 ($pom->head1->[3]->head2) { 733 for my $node (CFPlus::Pod::find skill_description => "*") {
464 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 734 my (undef, @par) = CFPlus::Pod::section_of $node;
465 } 735 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
466
467 \%skill_help
468 }; 736 };
469 737
470 for my $skill (values %{$self->{skill_info}}) { 738 for my $skill (values %{$self->{skill_info}}) {
471 $self->{map_widget}->add_command ("ready_skill $skill", 739 $self->{map_widget}->add_command ("ready_skill $skill",
472 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 740 (CFPlus::asxml "Ready the skill '$skill'\n\n")
473 . $skill_help->{$skill}); 741 . $skill_help{$skill});
474 $self->{map_widget}->add_command ("use_skill $skill", 742 $self->{map_widget}->add_command ("use_skill $skill",
475 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 743 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
476 . $skill_help->{$skill}); 744 . $skill_help{$skill});
477 } 745 }
478} 746}
479 747
480sub eof { 748sub eof {
481 my ($self) = @_; 749 my ($self) = @_;
… …
505 773
506 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 774 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
507 775
508 $self->send ("requestinfo image_sums $face $face"); 776 $self->send ("requestinfo image_sums $face $face");
509 777
510 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 778 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
511 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 779 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
512 } elsif (!exists $self->{num_faces}) { 780 } elsif (!exists $self->{num_faces}) {
513 $self->send ("requestinfo image_info"); 781 $self->send ("requestinfo image_info");
514 782
515 $self->{num_faces} = 0; 783 $self->{num_faces} = 0;
516 784
517 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 785 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
518 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 786 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
519 } 787 }
520} 788}
521 789
522sub update_floorbox { 790sub update_floorbox {
523 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 791 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
524 return unless $::CONN; 792 return unless $::CONN;
525 793
526 $::FLOORBOX->clear; 794 $::FLOORBOX->clear;
527 795
528 my $row; 796 my $row;
529 for (@{ $::CONN->{container}{0} }) { 797 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
530 if ($row < 6) { 798 if ($row < 6) {
531 local $_->{face_widget}; # hack to force recreation of widget 799 local $_->{face_widget}; # hack to force recreation of widget
532 local $_->{desc_widget}; # hack to force recreation of widget 800 local $_->{desc_widget}; # hack to force recreation of widget
533 CFClient::Item::update_widgets $_; 801 CFPlus::Item::update_widgets $_;
534 802
535 $::FLOORBOX->add (0, $row, $_->{face_widget}); 803 $::FLOORBOX->add (0, $row, $_->{face_widget});
536 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 804 $::FLOORBOX->add (1, $row, $_->{desc_widget});
537 805
538 $row++; 806 $row++;
539 } else { 807 } else {
540 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 808 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
541 text => "More...", 809 text => "More...",
542 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 810 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
543 ); 811 );
544 last; 812 last;
545 } 813 }
546 } 814 }
815 if ($::CONN->{open_container}) {
816 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
817 text => "Close container",
818 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
819 );
820 }
547 }); 821 });
548 822
549 $::WANT_REFRESH++; 823 $::WANT_REFRESH++;
550} 824}
551 825
552sub set_opencont { 826sub set_opencont {
553 my ($conn, $tag, $name) = @_; 827 my ($conn, $tag, $name) = @_;
554 $conn->{open_container} = $tag; 828 $conn->{open_container} = $tag;
829 update_floorbox;
555 830
556 $::INV_RIGHT_HB->clear (); 831 $::INV_RIGHT_HB->clear ();
557 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 832 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
558 833
559 if ($tag != 0) { # Floor isn't closable, is it? 834 if ($tag != 0) { # Floor isn't closable, is it?
560 $::INV_RIGHT_HB->add (new CFClient::UI::Button 835 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
561 text => "Close container", 836 text => "Close container",
562 tooltip => "Close the currently open container (if one is open)", 837 tooltip => "Close the currently open container (if one is open)",
563 on_activate => sub { 838 on_activate => sub {
564 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 839 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
565 if $tag != 0; 840 if $tag != 0;
566 #if $CONN->{open_container} != 0; 841 #if $CONN->{open_container} != 0;
842 0
567 }, 843 },
568 ); 844 );
569 } 845 }
570 846
571 $::INVR->set_items ($conn->{container}{$tag}); 847 $::INVR->set_items ($conn->{container}{$tag});
572} 848}
573 849
574sub update_container { 850sub update_containers {
575 my ($tag) = @_; 851 my ($self) = @_;
576 852
577 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 853 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
854 my $todo = delete $self->{update_container}
855 or return;
856
857 for my $tag (keys %$todo) {
858 update_floorbox if $tag == 0 or $tag == $self->{open_container};
859 if ($tag == 0) {
860 $::INVR->set_items ($self->{container}{0})
578 if $tag == $::CONN->{open_container}; 861 if $tag == $self->{open_container};
862 } elsif ($tag == $self->{player}{tag}) {
863 $::INV->set_items ($self->{container}{$tag})
864 } else {
865 $::INVR->set_items ($self->{container}{$tag})
866 if $tag == $self->{open_container};
867 }
868 }
869 });
579} 870}
580 871
581sub container_add { 872sub container_add {
582 my ($self, $tag, $items) = @_; 873 my ($self, $tag, $items) = @_;
583 874
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 875 $self->{update_container}{$tag}++;
585 876 $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} 877}
598 878
599sub container_clear { 879sub container_clear {
600 my ($self, $tag) = @_; 880 my ($self, $tag) = @_;
601 881
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 882 $self->{update_container}{$tag}++;
603 883 $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} 884}
615 885
616sub item_delete { 886sub item_delete {
617 my ($self, @items) = @_; 887 my ($self, @items) = @_;
618 888
889 $self->{update_container}{$_->{container}}++
619 for (@items) { 890 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 } 891
892 $self->update_containers;
631} 893}
632 894
633sub item_update { 895sub item_update {
634 my ($self, $item) = @_; 896 my ($self, $item) = @_;
635 897
636 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 898 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637 899
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; 900 CFPlus::Item::update_widgets $item;
644 901
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 902 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 903 set_opencont ($::CONN, 0, "Floor");
647 904
648 } elsif ($item->{flags} & F_OPEN) { 905 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 906 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
907
650 } else { 908 } else {
651 if ($item->{container} == 0) { 909 $self->{update_container}{$item->{container}}++;
652 update_floorbox;
653 update_container (0); 910 $self->update_containers;
654 } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}})
656 }
657 } 911 }
658} 912}
659 913
660sub player_update { 914sub player_update {
661 my ($self, $player) = @_; 915 my ($self, $player) = @_;
662 916
917 $self->update_weight;
918}
919
920sub update_weight {
921 my ($self) = @_;
922
923 my $weight = .001 * $self->{player}{weight};
924 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
925
663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 926 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
927 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
928 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
664} 929}
665 930
666sub update_server_info { 931sub update_server_info {
667 my ($self) = @_; 932 my ($self) = @_;
668 933
… …
671 $::SERVER_INFO->set_markup ( 936 $::SERVER_INFO->set_markup (
672 "server <tt>$self->{host}:$self->{port}</tt>\n" 937 "server <tt>$self->{host}:$self->{port}</tt>\n"
673 . "protocol version <tt>$self->{version}</tt>\n" 938 . "protocol version <tt>$self->{version}</tt>\n"
674 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 939 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
675 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 940 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
941 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
942 . "editing support $yesno[!!$self->{editor_support}]\n"
943 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
944 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
676 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 945 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
677 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 946 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
678 . "map size $self->{mapw}×$self->{maph}\n" 947 . "map size $self->{mapw}×$self->{maph}\n"
679 ); 948 );
949
950 ::setup_build_button ($self->{editor_support}->{builder_ui});
680} 951}
681 952
682sub logged_in { 953sub logged_in {
683 my ($self) = @_; 954 my ($self) = @_;
684 955
685 $self->send_ext_req (cfplus_support => "1", sub { 956 $self->send_ext_req (cfplus_support => version => 1, sub {
686 $self->{cfplus_ext} = $_[0]; 957 $self->{cfplus_ext} = $_[0]{version};
687 $self->update_server_info; 958 $self->update_server_info;
959
960 if ($self->{cfplus_ext} >= 2) {
961 $self->send_ext_req ("editor_support", sub {
962 $self->{editor_support} = $_[0];
963 $self->update_server_info;
964
965 0
966 });
967 }
968
969 0
688 }); 970 });
689 971
690 $self->update_server_info; 972 $self->update_server_info;
691 973
692 $self->send_command ("output-sync $::CFG->{output_sync}"); 974 $self->send_command ("output-sync $::CFG->{output_sync}");
693 $self->send_command ("output-count $::CFG->{output_count}"); 975 $self->send_command ("output-count $::CFG->{output_count}");
976 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
694 $self->send_command ("pickup $::CFG->{pickup}"); 977 $self->send_command ("pickup $::CFG->{pickup}");
978}
979
980sub buildat {
981 my ($self, $builditem, $x, $y) = @_;
982
983 if ($self->{cfplus_ext}) {
984 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
985 }
695} 986}
696 987
697sub lookat { 988sub lookat {
698 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
699 990
700 if ($self->{cfplus_ext}) { 991 if ($self->{cfplus_ext}) {
701 $self->send_ext_req (lookat => "$x $y", sub { 992 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
702 my %res = split /\x00/, $_[0]; 993 my ($msg) = @_;
703 994
704 if (exists $res{npc_dialog}) { 995 if (exists $msg->{npc_dialog}) {
705 # start npc chat dialog 996 # start npc chat dialog
706 $self->{npc_dialog} = new CFClient::NPCDialog:: 997 $self->{npc_dialog} = new CFPlus::NPCDialog::
707 dx => $x, 998 dx => $x,
708 dy => $y, 999 dy => $y,
709 title => "$res{npc_dialog} (NPC)", 1000 title => "$msg->{npc_dialog} (NPC)",
710 conn => $self, 1001 conn => $self,
711 ; 1002 ;
712 } 1003 }
713 }); 1004 });
714 } 1005 }
… …
717} 1008}
718 1009
719sub destroy { 1010sub destroy {
720 my ($self) = @_; 1011 my ($self) = @_;
721 1012
722 $self->{npc_dialog}->destroy 1013 (delete $self->{npc_dialog})->destroy
723 if $self->{npc_dialog}; 1014 if $self->{npc_dialog};
724 1015
725 $self->SUPER::destroy; 1016 $self->SUPER::destroy;
726} 1017}
727 1018
728package CFClient::NPCDialog; 1019package CFPlus::NPCDialog;
729 1020
730our @ISA = 'CFClient::UI::FancyFrame'; 1021our @ISA = 'CFPlus::UI::Toplevel';
731 1022
732sub new { 1023sub new {
733 my $class = shift; 1024 my $class = shift;
734 1025
735 my $self = $class->SUPER::new ( 1026 my $self = $class->SUPER::new (
… …
738 name => "npc_dialog", 1029 name => "npc_dialog",
739 force_w => $::WIDTH * 0.7, 1030 force_w => $::WIDTH * 0.7,
740 force_h => $::HEIGHT * 0.7, 1031 force_h => $::HEIGHT * 0.7,
741 title => "NPC Dialog", 1032 title => "NPC Dialog",
742 kw => { hi => 0, yes => 0, no => 0 }, 1033 kw => { hi => 0, yes => 0, no => 0 },
1034 has_close_button => 1,
743 @_, 1035 @_,
744 ); 1036 );
745 1037
746 Scalar::Util::weaken (my $this = $self); 1038 CFPlus::weaken (my $this = $self);
1039
1040 $self->connect (delete => sub { $this->destroy; 1 });
747 1041
748 # better use a pane... 1042 # better use a pane...
749 $self->add (my $hbox = new CFClient::UI::HBox); 1043 $self->add (my $hbox = new CFPlus::UI::HBox);
750 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1044 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
751 1045
752 $hbox->add (my $vbox = new CFClient::UI::VBox); 1046 $hbox->add (my $vbox = new CFPlus::UI::VBox);
753 1047
754 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1048 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
755 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1049 $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" 1050 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 { 1051 on_activate => sub {
762 my ($entry, $text) = @_; 1052 my ($entry, $text) = @_;
763 1053
764 return unless $text =~ /\S/; 1054 return unless $text =~ /\S/;
765 1055
766 $entry->set_text (""); 1056 $entry->set_text ("");
767 $this->send ($text); 1057 $this->send ($text);
1058
1059 0
768 }, 1060 },
769 ); 1061 );
770 1062
771 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1063 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
772 1064
773 $self->{close_button} = new CFClient::UI::Button 1065 $self->{bye_button} = new CFPlus::UI::Button
774 text => "Bye (close)", 1066 text => "Bye (close)",
775 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1067 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
776 on_activate => sub { $this->destroy }, 1068 on_activate => sub { $this->destroy; 1 },
777 ; 1069 ;
778 1070
779 $self->update_options; 1071 $self->update_options;
780 1072
781 $self->{token} = $self->{conn}->ext_token; 1073 $self->{id} = $self->{conn}->send_ext_req (
782 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1074 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
783 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1075 sub { $this && $this->feed (@_) }
1076 );
784 1077
785 $self->{entry}->focus_in; 1078 $self->{entry}->grab_focus;
786 1079
787 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1080 $self->{textview}->add_paragraph ({
1081 fg => [1, 1, 0, 1],
1082 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1083 });
788 1084
789 $self->show; 1085 $self->show;
790 $self 1086 $self
791}; 1087};
792 1088
793sub update_options { 1089sub update_options {
794 my ($self) = @_; 1090 my ($self) = @_;
795 1091
796 Scalar::Util::weaken $self; 1092 CFPlus::weaken $self;
797 1093
798 $self->{options}->clear; 1094 $self->{options}->clear;
799 $self->{options}->add ($self->{close_button}); 1095 $self->{options}->add ($self->{bye_button});
800 1096
801 for my $kw (sort keys %{ $self->{kw} }) { 1097 for my $kw (sort keys %{ $self->{kw} }) {
802 $self->{options}->add (new CFClient::UI::Button 1098 $self->{options}->add (new CFPlus::UI::Button
803 text => $kw, 1099 text => $kw,
804 on_activate => sub { 1100 on_activate => sub {
805 $self->send ($kw); 1101 $self->send ($kw);
1102 0
806 }, 1103 },
807 ); 1104 );
808 } 1105 }
809} 1106}
810 1107
811sub feed { 1108sub feed {
812 my ($self, $data) = @_; 1109 my ($self, $msg) = @_;
813 1110
814 my ($type, $msg) = split / /, $data, 2; 1111 CFPlus::weaken $self;
815 1112
816 if ($type eq "msg") { 1113 if ($msg->{msgtype} eq "reply") {
817 my ($msg, @kw) = split /\x00/, $msg; 1114 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
818 $self->{kw}{$_} = 1 for @kw; 1115 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
819 1116
820 $msg = CFClient::UI::Label::escape $msg; 1117 my $text = "\n" . CFPlus::asxml $msg->{msg};
821 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1118 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
822 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 1119 my @link;
1120 $text =~ s{
1121 ($match)
1122 }{
1123 my $kw = $1;
1124
1125 push @link, new CFPlus::UI::Label
1126 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1127 can_hover => 1,
1128 can_events => 1,
1129 padding_x => 0,
1130 padding_y => 0,
1131 on_button_up => sub {
1132 $self->send ($kw);
1133 };
1134
1135 "\x{fffc}"
1136 }giex;
823 1137
824 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 1138 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1139 $self->{textview}->scroll_to_bottom;
825 $self->update_options; 1140 $self->update_options;
826 } else { 1141 } else {
827 $self->destroy; 1142 $self->destroy;
828 } 1143 }
829 1144
… …
831} 1146}
832 1147
833sub send { 1148sub send {
834 my ($self, $msg) = @_; 1149 my ($self, $msg) = @_;
835 1150
836 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1151 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
837 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1152 $self->{textview}->scroll_to_bottom;
1153
1154 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
838} 1155}
839 1156
840sub destroy { 1157sub destroy {
841 my ($self) = @_; 1158 my ($self) = @_;
842 1159
843 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 1160 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
844 1161
1162 if ($self->{conn}) {
1163 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
845 delete $self->{conn}{npc_dialog}; 1164 delete $self->{conn}{npc_dialog};
846 $self->{conn}->disconnect_ext ($self->{token}); 1165 $self->{conn}->disconnect_ext ($self->{id});
1166 }
847 1167
848 $self->SUPER::destroy; 1168 $self->SUPER::destroy;
849} 1169}
850 1170
8511; 11711
1172

Diff Legend

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