… | |
… | |
15 | use Crossfire::Protocol::Base 0.95; |
15 | use Crossfire::Protocol::Base 0.95; |
16 | |
16 | |
17 | use base 'Crossfire::Protocol::Base'; |
17 | use base 'Crossfire::Protocol::Base'; |
18 | |
18 | |
19 | sub new { |
19 | sub new { |
20 | my $class = shift; |
20 | my ($class, %arg) = @_; |
21 | |
21 | |
22 | my $self = $class->SUPER::new (@_, |
22 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
23 | setup_req => { |
24 | extmap => 1, |
24 | extmap => 1, |
25 | smoothing => 1, |
25 | excmd => 1, |
|
|
26 | ywidget => 1, |
|
|
27 | %{$arg{setup_req} || {}}, |
26 | }, |
28 | }, |
27 | ); |
29 | ); |
28 | |
30 | |
29 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
30 | |
32 | |
… | |
… | |
46 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
47 | @args |
49 | @args |
48 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
49 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
50 | |
52 | |
|
|
53 | $self->connect_ext (event_music => sub { |
|
|
54 | my ($ev) = @_; |
|
|
55 | |
|
|
56 | return unless $::CFG->{bgm_enable}; |
|
|
57 | |
|
|
58 | my $faces = $ev->{faces}; |
|
|
59 | my @songs; |
|
|
60 | |
|
|
61 | # request music from server if appropriate |
|
|
62 | if (my $faces = $ev->{faces}) { |
|
|
63 | for (@$faces) { |
|
|
64 | my ($face, $pri, $chksum) = @$_; |
|
|
65 | utf8::downgrade $chksum; |
|
|
66 | |
|
|
67 | $chksum = unpack "H*", $chksum; |
|
|
68 | $self->{music_map}{$face} = $chksum; |
|
|
69 | |
|
|
70 | # check if already cached |
|
|
71 | CFPlus::DB::get "res-metadata" => $chksum, sub { |
|
|
72 | my ($meta_json) = @_; |
|
|
73 | my $path = CFPlus::DB::path_of_res $chksum; |
|
|
74 | |
|
|
75 | if (defined $meta_json) { |
|
|
76 | my $meta = $self->{json_coder}->decode ($meta_json); |
|
|
77 | $meta->{path} = $path; |
|
|
78 | $self->{music_meta}{$chksum} = $meta; |
|
|
79 | &::audio_music_set ($self->{songs}); |
|
|
80 | } else { |
|
|
81 | ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
|
|
82 | $self->ask_face ($face, -100 - $pri, undef, sub { |
|
|
83 | my $len = length $_[1]; |
|
|
84 | my ($meta_json, $data) = unpack "(w/a*)*", $_[1]; |
|
|
85 | |
|
|
86 | CFPlus::DB::write_file $path, $data, sub { |
|
|
87 | CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub { |
|
|
88 | my $meta = $self->{json_coder}->decode ($meta_json); |
|
|
89 | $meta->{path} = $path; |
|
|
90 | $self->{music_meta}{$chksum} = $meta; |
|
|
91 | |
|
|
92 | ::message ({ markup => "downloaded song #$face, size $len octets" }); |
|
|
93 | &::audio_music_set ($self->{songs}); |
|
|
94 | }; |
|
|
95 | }; |
|
|
96 | }); |
|
|
97 | } |
|
|
98 | } |
|
|
99 | } |
|
|
100 | } |
|
|
101 | |
|
|
102 | if (my $play = $ev->{play}) { |
|
|
103 | &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); |
|
|
104 | } |
|
|
105 | }); |
|
|
106 | |
51 | $self->connect_ext (event_capabilities => sub { |
107 | $self->connect_ext (event_capabilities => sub { |
52 | my ($cap) = @_; |
108 | my ($cap) = @_; |
53 | |
109 | |
54 | if (my $ts = $cap->{tileset}) { |
110 | if (my $ts = $cap->{tileset}) { |
55 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
111 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
… | |
… | |
60 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
116 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
61 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
117 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
62 | |
118 | |
63 | $self->setup_req (mapsize => "${w}x${h}"); |
119 | $self->setup_req (mapsize => "${w}x${h}"); |
64 | } |
120 | } |
|
|
121 | } |
|
|
122 | }); |
|
|
123 | |
|
|
124 | $self->{json_coder} |
|
|
125 | ->convert_blessed |
|
|
126 | ->filter_json_single_key_object (__widget_ref__ => sub { |
|
|
127 | $self->{widget}{$_[0]} |
|
|
128 | }); |
|
|
129 | |
|
|
130 | # widgetset new |
|
|
131 | $self->connect_ext (ws_n => sub { |
|
|
132 | my ($arg) = @_; |
|
|
133 | |
|
|
134 | $self->{widgetset}{$arg{id}} = { |
|
|
135 | w => {}, |
|
|
136 | }; |
|
|
137 | }); |
|
|
138 | |
|
|
139 | # widgetset destroy |
|
|
140 | $self->connect_ext (ws_d => sub { |
|
|
141 | my ($arg) = @_; |
|
|
142 | |
|
|
143 | my $ws = delete $self->{widgetset}{$arg{id}} |
|
|
144 | or return; |
|
|
145 | |
|
|
146 | $_->destroy |
|
|
147 | for values %{$ws->{w}}; |
|
|
148 | }); |
|
|
149 | |
|
|
150 | # widgetset destroy |
|
|
151 | $self->connect_ext (ws_c => sub { |
|
|
152 | my ($arg) = @_; |
|
|
153 | |
|
|
154 | my $args = $arg->{args} || {}; |
|
|
155 | |
|
|
156 | for my $ev (grep /^on_/, keys %$args) { |
|
|
157 | $args->{$ev} = sub { |
|
|
158 | my $id = shift->{s_id}; |
|
|
159 | $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); |
|
|
160 | |
|
|
161 | 1 |
|
|
162 | }; |
|
|
163 | } |
|
|
164 | |
|
|
165 | if (my $widget = eval { |
|
|
166 | local $SIG{__DIE__}; |
|
|
167 | "CFPlus::UI::$arg->{class}"->new ( |
|
|
168 | %$args, |
|
|
169 | s_ws => $arg->{ws}, |
|
|
170 | s_id => $arg->{id}, |
|
|
171 | ) |
|
|
172 | } |
|
|
173 | ) { |
|
|
174 | $self->{widget}{$arg->{id}} |
|
|
175 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
|
|
176 | = $widget; |
|
|
177 | |
|
|
178 | $widget->connect (on_destroy => sub { |
|
|
179 | my ($widget) = @_; |
|
|
180 | |
|
|
181 | delete $self->{widget}{$widget->{s_id}}; |
|
|
182 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
183 | }); |
|
|
184 | } else { |
|
|
185 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
|
|
186 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
|
|
187 | } |
|
|
188 | }); |
|
|
189 | |
|
|
190 | # widget call |
|
|
191 | $self->connect_ext (w_c => sub { |
|
|
192 | my ($arg) = @_; |
|
|
193 | |
|
|
194 | my $w = $self->{widget}{$arg->{id}} |
|
|
195 | or return; |
|
|
196 | my $m = $arg->{name}; |
|
|
197 | |
|
|
198 | my $a = $arg->{args} || []; |
|
|
199 | |
|
|
200 | if (exists $arg->{rid}) { |
|
|
201 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); |
|
|
202 | } else { |
|
|
203 | $w->$m (@$a); |
|
|
204 | } |
|
|
205 | }); |
|
|
206 | |
|
|
207 | # widget set |
|
|
208 | $self->connect_ext (w_s => sub { |
|
|
209 | my ($arg) = @_; |
|
|
210 | |
|
|
211 | my $w = $self->{widget}{$arg->{id}} |
|
|
212 | or return; |
|
|
213 | |
|
|
214 | my $attr = $arg->{attr}; |
|
|
215 | |
|
|
216 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
217 | $w->{$attr->[$i]} = $attr->[$i+1]; |
|
|
218 | $w->{parent}->realloc if $attr->[$i] =~ /^c_/ && $w->{visible};#d# really? |
|
|
219 | } |
|
|
220 | }); |
|
|
221 | |
|
|
222 | # widget get |
|
|
223 | $self->connect_ext (w_g => sub { |
|
|
224 | my ($arg) = @_; |
|
|
225 | |
|
|
226 | my $w = $self->{widget}{$arg->{id}} |
|
|
227 | or return; |
|
|
228 | |
|
|
229 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]); |
|
|
230 | }); |
|
|
231 | |
|
|
232 | # destroy widgets on logout |
|
|
233 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
234 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
235 | $_->destroy |
|
|
236 | for values %{delete $ws->{w} || {}}; |
65 | } |
237 | } |
66 | }); |
238 | }); |
67 | |
239 | |
68 | $self->{map_widget}->add_command (@$_) |
240 | $self->{map_widget}->add_command (@$_) |
69 | for @cmd_help; |
241 | for @cmd_help; |
… | |
… | |
248 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
420 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
249 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
421 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
250 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
422 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
251 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
423 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
252 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
424 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
253 | my $rng = $stats->{+CS_STAT_RANGE}; |
425 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
254 | $rng =~ s/^Range: //; # thank you so much dear server |
|
|
255 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
256 | my $title = $stats->{+CS_STAT_TITLE}; |
426 | my $title = $stats->{+CS_STAT_TITLE}; |
257 | $title =~ s/^Player: //; |
427 | $title =~ s/^Player: //; |
258 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
428 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
259 | |
429 | |
260 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
430 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
… | |
… | |
280 | my @skills = keys %{ $self->{skill_info} }; |
450 | my @skills = keys %{ $self->{skill_info} }; |
281 | |
451 | |
282 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
452 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
283 | $sktbl->clear; |
453 | $sktbl->clear; |
284 | |
454 | |
|
|
455 | my @add; |
|
|
456 | |
|
|
457 | push @add, |
285 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
458 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
286 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
459 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
287 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
460 | 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
288 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
461 | 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
289 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
462 | 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
290 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
463 | 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
|
|
464 | ; |
291 | |
465 | |
292 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
466 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
293 | |
467 | |
294 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
468 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
295 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
469 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
… | |
… | |
323 | } |
497 | } |
324 | |
498 | |
325 | 1 |
499 | 1 |
326 | }; |
500 | }; |
327 | |
501 | |
|
|
502 | push @add, |
328 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
503 | $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
329 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
504 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
330 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
505 | $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
331 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
506 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
332 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
507 | $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
333 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
508 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
509 | ; |
334 | |
510 | |
335 | $x++ and ($x, $y) = (0, $y + 1); |
511 | $x++ and ($x, $y) = (0, $y + 1); |
336 | } |
512 | } |
|
|
513 | |
|
|
514 | $sktbl->add_at (@add); |
337 | } |
515 | } |
338 | |
516 | |
339 | for (grep exists $stats->{$_}, @skills) { |
517 | for (grep exists $stats->{$_}, @skills) { |
340 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
518 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
341 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
519 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
… | |
… | |
432 | } |
610 | } |
433 | |
611 | |
434 | sub load_map($$$) { |
612 | sub load_map($$$) { |
435 | my ($self, $hash, $x, $y) = @_; |
613 | my ($self, $hash, $x, $y) = @_; |
436 | |
614 | |
|
|
615 | my $gen = $self->{map_change_gen}; |
|
|
616 | |
437 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
617 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
|
|
618 | return unless $gen == $self->{map_change_gen}; |
|
|
619 | |
438 | my ($data) = @_; |
620 | my ($data) = @_; |
439 | |
621 | |
440 | if (defined $data) { |
622 | if (defined $data) { |
441 | $data = Compress::LZF::decompress $data; |
623 | $data = Compress::LZF::decompress $data; |
442 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
624 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
… | |
… | |
517 | |
699 | |
518 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
700 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
519 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
701 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
520 | |
702 | |
521 | } else { |
703 | } else { |
|
|
704 | my $gen = $self->{map_change_gen}; |
522 | $self->send_mapinfo ("spatial $path$tile", sub { |
705 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
706 | return unless $gen == $self->{map_change_gen}; |
|
|
707 | |
523 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
708 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
524 | |
709 | |
525 | return if $mode ne "spatial"; |
710 | return if $mode ne "spatial"; |
526 | |
711 | |
527 | $x += $self->{map}->ox; |
712 | $x += $self->{map}->ox; |
… | |
… | |
541 | |
726 | |
542 | sub map_change { |
727 | sub map_change { |
543 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
728 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
544 | |
729 | |
545 | $self->flush_map; |
730 | $self->flush_map; |
|
|
731 | |
|
|
732 | ++$self->{map_change_gen}; |
546 | |
733 | |
547 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
734 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
548 | |
735 | |
549 | my $mapmapw = $self->{mapmap}->{w}; |
736 | my $mapmapw = $self->{mapmap}->{w}; |
550 | my $mapmaph = $self->{mapmap}->{h}; |
737 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
599 | } |
786 | } |
600 | |
787 | |
601 | sub set_texture { |
788 | sub set_texture { |
602 | my ($self, $id, $data) = @_; |
789 | my ($self, $id, $data) = @_; |
603 | |
790 | |
|
|
791 | return unless $self->{map}; |
|
|
792 | |
604 | $self->{texture}[$id] = my $tex = |
793 | $self->{texture}[$id] = my $tex = |
605 | new_from_image CFPlus::Texture |
794 | new_from_image CFPlus::Texture |
606 | $data, minify => 1, mipmap => 1; |
795 | $data, minify => 1, mipmap => 1; |
607 | |
796 | |
608 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
797 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
609 | $self->{map_widget}->update; |
798 | $self->{map_widget}->update; |
|
|
799 | |
|
|
800 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
|
|
801 | } |
|
|
802 | |
|
|
803 | sub connect_face_update { |
|
|
804 | my ($self, $id, $cb) = @_; |
|
|
805 | |
|
|
806 | push @{$self->{face_cb}{$id}}, $cb; |
|
|
807 | |
|
|
808 | CFPlus::guard { |
|
|
809 | @{$self->{face_cb}{$id}} |
|
|
810 | = grep $_ != $cb, |
|
|
811 | @{$self->{face_cb}{$id}}; |
|
|
812 | } |
610 | } |
813 | } |
611 | |
814 | |
612 | sub sound_play { |
815 | sub sound_play { |
613 | my ($self, $x, $y, $soundnum, $type) = @_; |
816 | my ($self, $x, $y, $soundnum, $type) = @_; |
614 | |
817 | |
… | |
… | |
624 | $LAST_QUERY = $prompt; |
827 | $LAST_QUERY = $prompt; |
625 | |
828 | |
626 | $self->{query}-> ($self, $flags, $prompt); |
829 | $self->{query}-> ($self, $flags, $prompt); |
627 | } |
830 | } |
628 | |
831 | |
629 | sub drawinfo { |
832 | sub sanitise_xml($) { |
630 | my ($self, $color, $text) = @_; |
833 | local $_ = shift; |
631 | |
834 | |
632 | my @color = ( |
835 | # we now weed out all tags we do not support |
|
|
836 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
837 | # now all entities |
|
|
838 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
839 | |
|
|
840 | # handle some elements |
|
|
841 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
842 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
843 | |
|
|
844 | $_ |
|
|
845 | } |
|
|
846 | |
|
|
847 | our %NAME_TO_COLOR = ( |
|
|
848 | black => 0, |
|
|
849 | white => 1, |
|
|
850 | darkblue => 2, |
|
|
851 | red => 3, |
|
|
852 | orange => 4, |
|
|
853 | lightblue => 5, |
|
|
854 | darkorange => 6, |
|
|
855 | green => 7, |
|
|
856 | darkgreen => 8, |
|
|
857 | grey => 9, |
|
|
858 | brown => 10, |
|
|
859 | yellow => 11, |
|
|
860 | tan => 12, |
|
|
861 | ); |
|
|
862 | |
|
|
863 | our @CF_COLOR = ( |
633 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
864 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
634 | [1.00, 1.00, 1.00], |
865 | [1.00, 1.00, 1.00], |
635 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
866 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
636 | [1.00, 0.00, 0.00], |
867 | [1.00, 0.00, 0.00], |
637 | [1.00, 0.54, 0.00], |
868 | [1.00, 0.54, 0.00], |
638 | [0.11, 0.56, 1.00], |
869 | [0.11, 0.56, 1.00], |
639 | [0.93, 0.46, 0.00], |
870 | [0.93, 0.46, 0.00], |
640 | [0.18, 0.54, 0.34], |
871 | [0.18, 0.54, 0.34], |
641 | [0.56, 0.73, 0.56], |
872 | [0.56, 0.73, 0.56], |
642 | [0.80, 0.80, 0.80], |
873 | [0.80, 0.80, 0.80], |
643 | [0.75, 0.61, 0.20], |
874 | [0.75, 0.61, 0.20], |
644 | [0.99, 0.77, 0.26], |
875 | [0.99, 0.77, 0.26], |
645 | [0.74, 0.65, 0.41], |
876 | [0.74, 0.65, 0.41], |
646 | ); |
877 | ); |
647 | |
878 | |
648 | my $fg = $color[$color % @color]; |
879 | sub msg { |
|
|
880 | my ($self, $color, $type, $text, @extra) = @_; |
649 | |
881 | |
|
|
882 | $text = sanitise_xml $text; |
|
|
883 | |
|
|
884 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
885 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
886 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
887 | $type =~ s/-/_/g; |
|
|
888 | $self->{$type} = $text; |
|
|
889 | } else { |
650 | $self->logprint ("info: ", $text); |
890 | $self->logprint ("msg: ", $text); |
|
|
891 | return if $color < 0; # negative color == ignore if not understood |
651 | |
892 | |
|
|
893 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
|
|
894 | |
652 | # try to create single paragraphs of multiple lines sent by the server |
895 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
896 | # no longer neecssary with TRT servers |
653 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
897 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
654 | |
898 | |
655 | $text = CFPlus::asxml $text; |
|
|
656 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
|
|
657 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
|
|
658 | |
|
|
659 | ::message ({ fg => $fg, markup => $_ }) |
899 | ::message ({ fg => $fg, markup => $_ }) |
660 | for split /\n/, $text; |
900 | for split /\n/, $text; |
661 | |
901 | |
662 | $self->{statusbox}->add ($text, |
902 | $self->{statusbox}->add ($text, |
663 | group => $text, |
903 | group => $text, |
664 | fg => $fg, |
904 | fg => $fg, |
665 | timeout => $color >= 2 ? 180 : 10, |
905 | timeout => $color >= 2 ? 180 : 10, |
666 | tooltip_font => $::FONT_FIXED, |
906 | tooltip_font => $::FONT_FIXED, |
667 | ); |
907 | ); |
668 | } |
908 | } |
669 | |
|
|
670 | sub drawextinfo { |
|
|
671 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
672 | |
|
|
673 | $self->drawinfo ($color, $message); |
|
|
674 | } |
909 | } |
675 | |
910 | |
676 | sub spell_add { |
911 | sub spell_add { |
677 | my ($self, $spell) = @_; |
912 | my ($self, $spell) = @_; |
678 | |
913 | |
… | |
… | |
766 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1001 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
767 | return unless $::CONN; |
1002 | return unless $::CONN; |
768 | |
1003 | |
769 | $::FLOORBOX->clear; |
1004 | $::FLOORBOX->clear; |
770 | |
1005 | |
|
|
1006 | my @add; |
|
|
1007 | |
771 | my $row; |
1008 | my $row; |
772 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1009 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
773 | if ($row < 6) { |
1010 | if ($row < 6) { |
774 | local $_->{face_widget}; # hack to force recreation of widget |
1011 | local $_->{face_widget}; # hack to force recreation of widget |
775 | local $_->{desc_widget}; # hack to force recreation of widget |
1012 | local $_->{desc_widget}; # hack to force recreation of widget |
776 | CFPlus::Item::update_widgets $_; |
1013 | CFPlus::Item::update_widgets $_; |
777 | |
1014 | |
|
|
1015 | push @add, |
778 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
1016 | 0, $row, $_->{face_widget}, |
779 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
1017 | 1, $row, $_->{desc_widget}; |
780 | |
1018 | |
781 | $row++; |
1019 | $row++; |
782 | } else { |
1020 | } else { |
783 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
1021 | push @add, 1, $row, new CFPlus::UI::Button |
784 | text => "More...", |
1022 | text => "More...", |
785 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1023 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
786 | ); |
1024 | ; |
787 | last; |
1025 | last; |
788 | } |
1026 | } |
789 | } |
1027 | } |
790 | if ($::CONN->{open_container}) { |
1028 | if ($::CONN->{open_container}) { |
791 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
1029 | push @add, 1, $row++, new CFPlus::UI::Button |
792 | text => "Close container", |
1030 | text => "Close container", |
793 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1031 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
794 | ); |
1032 | ; |
795 | } |
1033 | } |
|
|
1034 | |
|
|
1035 | $::FLOORBOX->add_at (@add); |
796 | }); |
1036 | }); |
797 | |
1037 | |
798 | $::WANT_REFRESH++; |
1038 | $::WANT_REFRESH++; |
799 | } |
1039 | } |
800 | |
1040 | |
… | |
… | |
911 | $::SERVER_INFO->set_markup ( |
1151 | $::SERVER_INFO->set_markup ( |
912 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1152 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
913 | . "protocol version <tt>$self->{version}</tt>\n" |
1153 | . "protocol version <tt>$self->{version}</tt>\n" |
914 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1154 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
915 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1155 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
1156 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
916 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1157 | . "editing support $yesno[!!$self->{editor_support}]\n" |
917 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1158 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
1159 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
918 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1160 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
919 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1161 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
920 | . "map size $self->{mapw}×$self->{maph}\n" |
1162 | . "map size $self->{mapw}×$self->{maph}\n" |
921 | ); |
1163 | ); |
922 | |
1164 | |
… | |
… | |
985 | |
1227 | |
986 | (delete $self->{npc_dialog})->destroy |
1228 | (delete $self->{npc_dialog})->destroy |
987 | if $self->{npc_dialog}; |
1229 | if $self->{npc_dialog}; |
988 | |
1230 | |
989 | $self->SUPER::destroy; |
1231 | $self->SUPER::destroy; |
|
|
1232 | |
|
|
1233 | %$self = (); |
990 | } |
1234 | } |
991 | |
1235 | |
992 | package CFPlus::NPCDialog; |
1236 | package CFPlus::NPCDialog; |
993 | |
1237 | |
994 | our @ISA = 'CFPlus::UI::Toplevel'; |
1238 | our @ISA = 'CFPlus::UI::Toplevel'; |
… | |
… | |
1085 | |
1329 | |
1086 | if ($msg->{msgtype} eq "reply") { |
1330 | if ($msg->{msgtype} eq "reply") { |
1087 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1331 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1088 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1332 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1089 | |
1333 | |
1090 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
1334 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
1091 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1335 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1092 | my @link; |
1336 | my @link; |
1093 | $text =~ s{ |
1337 | $text =~ s{ |
1094 | ($match) |
1338 | ($match) |
1095 | }{ |
1339 | }{ |