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.59 by root, Sun Jul 16 23:30:08 2006 UTC

… …
7 7
8use CFClient; 8use CFClient;
9use CFClient::UI; 9use CFClient::UI;
10 10
11use base 'Crossfire::Protocol::Base'; 11use base 'Crossfire::Protocol::Base';
12
13our %open_logs;
14 12
15sub new { 13sub new {
16 my $class = shift; 14 my $class = shift;
17 15
18 my $self = $class->SUPER::new (@_); 16 my $self = $class->SUPER::new (@_);
… …
63 $self 61 $self
64} 62}
65 63
66sub logprint { 64sub logprint {
67 my ($self, @a) = @_; 65 my ($self, @a) = @_;
66
67 $self->{log_fh} ||= do {
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}"; 68 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69 69
70 my $fh = $open_logs{$filename}; 70 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}: $!"; 71 or die "Couldn't open logfile $path: $!";
75 72
76 $open_logs{$filename} = $fh; 73 $fh->autoflush (1);
74
75 $fh;
77 } 76 };
78 77
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time); 78 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80 79
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", 80 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec; 81 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83 82
84 print $fh "$ts ", @a, "\n"; 83 print {$self->{log_fh}} "$ts ", @a, "\n";
85 $fh->flush;
86} 84}
87 85
86sub _stat_numdiff {
87 my ($self, $name, $old, $new) = @_;
88 88
89 my $diff = $new - $old;
90
91 $diff = 0.01 * int $diff * 100;
92
93 0.1 >= abs $diff ? ()
94 : $diff < 0 ? "$name$diff" : "$name+$diff"
95}
96
97sub _stat_skillmaskdiff {
98 my ($self, $name, $old, $new) = @_;
99
100 my $diff = $old ^ $new
101 or return;
102
103 my @diff = map
104 {
105 $diff & $_
106 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
107 : ()
108 }
109 sort { $a <=> $b } keys %{$self->{spell_paths}};
110
111 join "", @diff
112}
113
114# all stats that are chacked against changes
115my @statchange = (
116 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
117 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
118 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
119 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
120 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
121 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
122 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
123 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
124 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
125 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
126 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
127 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
128 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
129 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
130 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
131 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
132 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
133 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
134 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
135 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
136 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
137 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
138 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
139 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
140 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
141 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
142 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
143 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
144 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
145 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
146 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
147 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
148 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
149 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
150 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
151 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
152 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
153);
89 154
90sub stats_update { 155sub stats_update {
91 my ($self, $stats) = @_; 156 my ($self, $stats) = @_;
92 157
93 if (my $exp = $stats->{+CS_STAT_EXP64}) { 158 my $prev = $self->{prev_stats} || { };
94 my $diff = $exp - $self->{prev_exp}; 159
160 if (my @diffs =
161 (
162 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
163 map {
164 $stats->{$_} && $prev->{$_}
165 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
166 } sort { $a <=> $b } keys %{$self->{skill_info}}
167 )
168 ) {
169 my $msg = join " ", @diffs;
95 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 170 $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 } 171 }
99 172
173 if (
174 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
175 ) {
176 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
177 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
178 }
179
100 ::update_stats_window ($stats); 180 $self->update_stats_window ($stats, $prev);
181
182 $self->{prev_stats} = { %$stats };
183}
184
185my %RES_TBL = (
186 phys => CS_STAT_RES_PHYS,
187 magic => CS_STAT_RES_MAG,
188 fire => CS_STAT_RES_FIRE,
189 elec => CS_STAT_RES_ELEC,
190 cold => CS_STAT_RES_COLD,
191 conf => CS_STAT_RES_CONF,
192 acid => CS_STAT_RES_ACID,
193 drain => CS_STAT_RES_DRAIN,
194 ghit => CS_STAT_RES_GHOSTHIT,
195 pois => CS_STAT_RES_POISON,
196 slow => CS_STAT_RES_SLOW,
197 para => CS_STAT_RES_PARA,
198 tund => CS_STAT_TURN_UNDEAD,
199 fear => CS_STAT_RES_FEAR,
200 depl => CS_STAT_RES_DEPLETE,
201 deat => CS_STAT_RES_DEATH,
202 holyw => CS_STAT_RES_HOLYWORD,
203 blind => CS_STAT_RES_BLIND,
204);
205
206sub update_stats_window {
207 my ($self, $stats, $prev) = @_;
208
209 # I love text protocols...
210
211 my $hp = $stats->{+CS_STAT_HP} * 1;
212 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
213 my $sp = $stats->{+CS_STAT_SP} * 1;
214 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
215 my $fo = $stats->{+CS_STAT_FOOD} * 1;
216 my $fo_m = 999;
217 my $gr = $stats->{+CS_STAT_GRACE} * 1;
218 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
219
220 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
221 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
222 $::GAUGES->{food} ->set_value ($fo, $fo_m);
223 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
224 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
225 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
226 my $rng = $stats->{+CS_STAT_RANGE};
227 $rng =~ s/^Range: //; # thank you so much dear server
228 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
229 my $title = $stats->{+CS_STAT_TITLE};
230 $title =~ s/^Player: //;
231 $::STATWIDS->{title} ->set_text ("Title: " . $title);
232
233 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
234 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
235 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
236 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
237 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
238 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
239 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
240 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
241 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
248
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL;
251
252 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} };
254
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear;
257
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1);
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1);
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1);
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1);
264
265 my ($x, $y) = (0, 0);
266 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_},
270 @skills
271 ) {
272 my ($idx, $name) = @$_;
273
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]);
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4);
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name);
279
280 $x++ and ($x, $y) = (0, $y + 1);
281 }
282 }
283
284 for (grep exists $stats->{$_}, @skills) {
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
287 }
101} 288}
102 289
103sub user_send { 290sub user_send {
104 my ($self, $command) = @_; 291 my ($self, $command) = @_;
105 292
… …
107 push @{$self->{record}}, $command; 294 push @{$self->{record}}, $command;
108 } 295 }
109 296
110 $self->logprint ("send: ", $command); 297 $self->logprint ("send: ", $command);
111 $self->send_command ($command); 298 $self->send_command ($command);
112 ::status $command; 299 ::status ($command);
113} 300}
114 301
115sub start_record { 302sub start_record {
116 my ($self) = @_; 303 my ($self) = @_;
117 304
… …
345 undef 532 undef
346 }; 533 };
347} 534}
348 535
349sub face_update { 536sub face_update {
350 my ($self, $facenum, $face) = @_; 537 my ($self, $facenum, $face, $changed) = @_;
351 538
352 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
353 540
354 $self->set_texture ($face->{id} => delete $face->{image}); 541 $self->set_texture ($face->{id} => delete $face->{image});
355} 542}
356 543
357sub set_texture { 544sub set_texture {
… …
414 601
415 $text = CFClient::UI::Label::escape $text; 602 $text = CFClient::UI::Label::escape $text;
416 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
417 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
418 605
419 $self->{logview}->add_paragraph ($color[$color], 606 $self->{logview}->add_paragraph ($color[$color], $_)
420 join "\n", map "$time $_", split /\n/, $text); 607 for map "$time $_", split /\n/, $text;
608 $self->{logview}->scroll_to_bottom;
421 609
422 $self->{statusbox}->add ($text, 610 $self->{statusbox}->add ($text,
423 group => $text, 611 group => $text,
424 fg => $color[$color], 612 fg => $color[$color],
425 timeout => $color >= 2 ? 60 : 10, 613 timeout => $color >= 2 ? 60 : 10,
… …
439 # try to create single paragraphs of multiple lines sent by the server 627 # try to create single paragraphs of multiple lines sent by the server
440 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
441 $spell->{message} =~ s/\n+$//; 629 $spell->{message} =~ s/\n+$//;
442 $spell->{message} ||= "Server did not provide a description for this spell."; 630 $spell->{message} ||= "Server did not provide a description for this spell.";
443 631
444 $::SETUP_SPELLS->add_spell ($spell); 632 $::SPELL_PAGE->add_spell ($spell);
445 633
446 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
447 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
448} 636}
449 637
450sub spell_delete { 638sub spell_delete {
451 my ($self, $spell) = @_; 639 my ($self, $spell) = @_;
640
452 $::SETUP_SPELLS->remove_spell ($spell); 641 $::SPELL_PAGE->remove_spell ($spell);
453} 642}
454 643
455sub addme_success { 644sub addme_success {
456 my ($self) = @_; 645 my ($self) = @_;
457 646
… …
524 return unless $::CONN; 713 return unless $::CONN;
525 714
526 $::FLOORBOX->clear; 715 $::FLOORBOX->clear;
527 716
528 my $row; 717 my $row;
529 for (@{ $::CONN->{container}{0} }) { 718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
530 if ($row < 6) { 719 if ($row < 6) {
531 local $_->{face_widget}; # hack to force recreation of widget 720 local $_->{face_widget}; # hack to force recreation of widget
532 local $_->{desc_widget}; # hack to force recreation of widget 721 local $_->{desc_widget}; # hack to force recreation of widget
533 CFClient::Item::update_widgets $_; 722 CFClient::Item::update_widgets $_;
534 723
… …
537 726
538 $row++; 727 $row++;
539 } else { 728 } else {
540 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
541 text => "More...", 730 text => "More...",
542 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
543 ); 732 );
544 last; 733 last;
545 } 734 }
546 } 735 }
547 }); 736 });
… …
562 tooltip => "Close the currently open container (if one is open)", 751 tooltip => "Close the currently open container (if one is open)",
563 on_activate => sub { 752 on_activate => sub {
564 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 753 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
565 if $tag != 0; 754 if $tag != 0;
566 #if $CONN->{open_container} != 0; 755 #if $CONN->{open_container} != 0;
756 0
567 }, 757 },
568 ); 758 );
569 } 759 }
570 760
571 $::INVR->set_items ($conn->{container}{$tag}); 761 $::INVR->set_items ($conn->{container}{$tag});
572} 762}
573 763
574sub update_container { 764sub update_containers {
575 my ($tag) = @_; 765 my ($self) = @_;
576 766
577 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 767 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
768 my $todo = delete $self->{update_container}
769 or return;
770
771 for my $tag (keys %$todo) {
772 if ($tag == 0) {
773 update_floorbox;
774 $::INVR->set_items ($self->{container}{0})
578 if $tag == $::CONN->{open_container}; 775 if $tag == $self->{open_container};
776 } elsif ($tag == $self->{player}{tag}) {
777 $::INV->set_items ($self->{container}{$tag})
778 } else {
779 $::INVR->set_items ($self->{container}{$tag})
780 if $tag == $self->{open_container};
781 }
782 }
783 });
579} 784}
580 785
581sub container_add { 786sub container_add {
582 my ($self, $tag, $items) = @_; 787 my ($self, $tag, $items) = @_;
583 788
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 789 $self->{update_container}{$tag}++;
585 790 $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} 791}
598 792
599sub container_clear { 793sub container_clear {
600 my ($self, $tag) = @_; 794 my ($self, $tag) = @_;
601 795
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 796 $self->{update_container}{$tag}++;
603 797 $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} 798}
615 799
616sub item_delete { 800sub item_delete {
617 my ($self, @items) = @_; 801 my ($self, @items) = @_;
618 802
803 $self->{update_container}{$_->{container}}++
619 for (@items) { 804 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 } 805
806 $self->update_containers;
631} 807}
632 808
633sub item_update { 809sub item_update {
634 my ($self, $item) = @_; 810 my ($self, $item) = @_;
635 811
636 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 812 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637 813
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; 814 CFClient::Item::update_widgets $item;
644 815
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 816 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 817 set_opencont ($::CONN, 0, "Floor");
647 818
648 } elsif ($item->{flags} & F_OPEN) { 819 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 820 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
821
650 } else { 822 } else {
651 if ($item->{container} == 0) { 823 $self->{update_container}{$item->{container}}++;
652 update_floorbox;
653 update_container (0); 824 $self->update_containers;
654 } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}})
656 }
657 } 825 }
658} 826}
659 827
660sub player_update { 828sub player_update {
661 my ($self, $player) = @_; 829 my ($self, $player) = @_;
662
663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 830 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
664} 831}
665 832
666sub update_server_info { 833sub update_server_info {
667 my ($self) = @_; 834 my ($self) = @_;
… …
763 930
764 return unless $text =~ /\S/; 931 return unless $text =~ /\S/;
765 932
766 $entry->set_text (""); 933 $entry->set_text ("");
767 $this->send ($text); 934 $this->send ($text);
935
936 0
768 }, 937 },
769 ); 938 );
770 939
771 $vbox->add ($self->{options} = new CFClient::UI::VBox); 940 $vbox->add ($self->{options} = new CFClient::UI::VBox);
772 941
773 $self->{close_button} = new CFClient::UI::Button 942 $self->{bye_button} = new CFClient::UI::Button
774 text => "Bye (close)", 943 text => "Bye (close)",
775 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 944 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
776 on_activate => sub { $this->destroy }, 945 on_activate => sub { $this->destroy; 0 },
777 ; 946 ;
778 947
779 $self->update_options; 948 $self->update_options;
780 949
781 $self->{token} = $self->{conn}->ext_token; 950 $self->{token} = $self->{conn}->ext_token;
782 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 951 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
783 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 952 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
784 953
785 $self->{entry}->focus_in; 954 $self->{entry}->grab_focus;
786 955
787 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 956 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
788 957
789 $self->show; 958 $self->show;
790 $self 959 $self
… …
794 my ($self) = @_; 963 my ($self) = @_;
795 964
796 Scalar::Util::weaken $self; 965 Scalar::Util::weaken $self;
797 966
798 $self->{options}->clear; 967 $self->{options}->clear;
799 $self->{options}->add ($self->{close_button}); 968 $self->{options}->add ($self->{bye_button});
800 969
801 for my $kw (sort keys %{ $self->{kw} }) { 970 for my $kw (sort keys %{ $self->{kw} }) {
802 $self->{options}->add (new CFClient::UI::Button 971 $self->{options}->add (new CFClient::UI::Button
803 text => $kw, 972 text => $kw,
804 on_activate => sub { 973 on_activate => sub {
805 $self->send ($kw); 974 $self->send ($kw);
975 0
806 }, 976 },
807 ); 977 );
808 } 978 }
809} 979}
810 980
811sub feed { 981sub feed {
812 my ($self, $data) = @_; 982 my ($self, $data) = @_;
983
984 Scalar::Util::weaken $self;
813 985
814 my ($type, $msg) = split / /, $data, 2; 986 my ($type, $msg) = split / /, $data, 2;
815 987
816 if ($type eq "msg") { 988 if ($type eq "msg") {
817 my ($msg, @kw) = split /\x00/, $msg; 989 my ($msg, @kw) = split /\x00/, $msg;
818 $self->{kw}{$_} = 1 for @kw; 990 $self->{kw}{$_} = 1 for @kw;
819 991
820 $msg = CFClient::UI::Label::escape $msg; 992 $msg = "\n" . CFClient::UI::Label::escape $msg;
821 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 993 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. 994 my @link;
995 $msg =~ s{
996 ($match)
997 }{
998 my $kw = $1;
999
1000 push @link, new CFClient::UI::Label
1001 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1002 can_hover => 1,
1003 can_events => 1,
1004 padding_x => 0,
1005 padding_y => 0,
1006 on_button_up => sub {
1007 $self->send ($kw);
1008 };
1009
1010 chr 0xfffc
1011 }giex;
823 1012
824 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 1013 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
1014 $self->{textview}->scroll_to_bottom;
825 $self->update_options; 1015 $self->update_options;
826 } else { 1016 } else {
827 $self->destroy; 1017 $self->destroy;
828 } 1018 }
829 1019
… …
833sub send { 1023sub send {
834 my ($self, $msg) = @_; 1024 my ($self, $msg) = @_;
835 1025
836 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1026 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
837 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1027 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
1028 $self->{textview}->scroll_to_bottom;
838} 1029}
839 1030
840sub destroy { 1031sub destroy {
841 my ($self) = @_; 1032 my ($self) = @_;
842 1033
843 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 1034 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
844 1035
1036 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
845 delete $self->{conn}{npc_dialog}; 1037 delete $self->{conn}{npc_dialog};
846 $self->{conn}->disconnect_ext ($self->{token}); 1038 $self->{conn}->disconnect_ext ($self->{token});
847 1039
848 $self->SUPER::destroy; 1040 $self->SUPER::destroy;
849} 1041}

Diff Legend

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