… | |
… | |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Crossfire::Protocol::Constants; |
6 | use Crossfire::Protocol::Constants; |
7 | |
7 | |
8 | use CFPlus; |
8 | use CFPlus; |
|
|
9 | use CFPlus::DB; |
9 | use CFPlus::UI; |
10 | use CFPlus::UI; |
10 | use CFPlus::Pod; |
11 | use CFPlus::Pod; |
11 | use CFPlus::Macro; |
12 | use CFPlus::Macro; |
12 | use CFPlus::Item; |
13 | use CFPlus::Item; |
13 | |
14 | |
14 | use Crossfire::Protocol::Base 0.95; |
15 | use Crossfire::Protocol::Base 0.95; |
15 | |
16 | |
16 | use base 'Crossfire::Protocol::Base'; |
17 | use base 'Crossfire::Protocol::Base'; |
17 | |
18 | |
18 | sub new { |
19 | sub new { |
19 | my $class = shift; |
20 | my ($class, %arg) = @_; |
20 | |
21 | |
21 | my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); |
22 | my $self = $class->SUPER::new (%arg, |
|
|
23 | setup_req => { |
|
|
24 | extmap => 1, |
|
|
25 | excmd => 1, |
|
|
26 | ywidget => 1, |
|
|
27 | %{$arg{setup_req} || {}}, |
|
|
28 | }, |
|
|
29 | ); |
22 | |
30 | |
23 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
24 | |
32 | |
25 | my @cmd_help = map { |
33 | my @cmd_help = map { |
26 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
… | |
… | |
37 | for @args; |
45 | for @args; |
38 | |
46 | |
39 | map ["$cmd$_", $text], |
47 | map ["$cmd$_", $text], |
40 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
41 | @args |
49 | @args |
42 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
43 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
44 | |
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 | |
|
|
107 | $self->connect_ext (event_capabilities => sub { |
|
|
108 | my ($cap) = @_; |
|
|
109 | |
|
|
110 | if (my $ts = $cap->{tileset}) { |
|
|
111 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
112 | $self->{tileset} = $default; |
|
|
113 | $self->{tilesize} = $default->[3]; |
|
|
114 | $self->setup_req (tileset => $default->[0]); |
|
|
115 | |
|
|
116 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
117 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
118 | |
|
|
119 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
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 | $w->{$arg->{name}} = $arg->{value}; |
|
|
215 | }); |
|
|
216 | |
|
|
217 | # widget get |
|
|
218 | $self->connect_ext (w_g => sub { |
|
|
219 | my ($arg) = @_; |
|
|
220 | |
|
|
221 | my $w = $self->{widget}{$arg->{id}} |
|
|
222 | or return; |
|
|
223 | |
|
|
224 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); |
|
|
225 | }); |
|
|
226 | |
|
|
227 | # destroy widgets on logout |
|
|
228 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
229 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
230 | $_->destroy |
|
|
231 | for values %{delete $ws->{w} || {}}; |
|
|
232 | } |
|
|
233 | }); |
|
|
234 | |
45 | $self->{map_widget}->add_command (@$_) |
235 | $self->{map_widget}->add_command (@$_) |
46 | for @cmd_help; |
236 | for @cmd_help; |
47 | |
|
|
48 | $self->{noface} = new_from_file CFPlus::Texture |
|
|
49 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
50 | |
237 | |
51 | { |
238 | { |
52 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
239 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
53 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
240 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
54 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
241 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
55 | } |
242 | } |
56 | |
243 | |
|
|
244 | { |
|
|
245 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
|
|
246 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
247 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
248 | } |
|
|
249 | |
57 | $self->{open_container} = 0; |
250 | $self->{open_container} = 0; |
58 | |
251 | |
59 | # "global" |
|
|
60 | $self->{tilecache} = CFPlus::db_table "tilecache" |
|
|
61 | or die "tilecache: unable to open database table"; |
|
|
62 | $self->{facemap} = CFPlus::db_table "facemap" |
|
|
63 | or die "facemap: unable to open database table"; |
|
|
64 | |
|
|
65 | # per server |
252 | # per server |
66 | $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" |
253 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
67 | or die "mapcache_$self->{host}_$self->{port}: unable to open database table"; |
|
|
68 | |
254 | |
69 | $self |
255 | $self |
70 | } |
256 | } |
71 | |
257 | |
72 | sub logprint { |
258 | sub logprint { |
… | |
… | |
229 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
415 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
230 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
416 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
231 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
417 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
232 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
418 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
233 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
419 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
234 | my $rng = $stats->{+CS_STAT_RANGE}; |
420 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
235 | $rng =~ s/^Range: //; # thank you so much dear server |
|
|
236 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
237 | my $title = $stats->{+CS_STAT_TITLE}; |
421 | my $title = $stats->{+CS_STAT_TITLE}; |
238 | $title =~ s/^Player: //; |
422 | $title =~ s/^Player: //; |
239 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
423 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
240 | |
424 | |
241 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
425 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
… | |
… | |
374 | or return; |
558 | or return; |
375 | |
559 | |
376 | my ($hash, $x, $y, $w, $h) = @$map_info; |
560 | my ($hash, $x, $y, $w, $h) = @$map_info; |
377 | |
561 | |
378 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
562 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
379 | $self->{mapcache}->put ($hash => Compress::LZF::compress $data); |
563 | CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; |
380 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
564 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
381 | } |
565 | } |
382 | |
566 | |
383 | sub map_clear { |
567 | sub map_clear { |
384 | my ($self) = @_; |
568 | my ($self) = @_; |
… | |
… | |
388 | |
572 | |
389 | $self->{map}->clear; |
573 | $self->{map}->clear; |
390 | delete $self->{map_widget}{magicmap}; |
574 | delete $self->{map_widget}{magicmap}; |
391 | } |
575 | } |
392 | |
576 | |
|
|
577 | sub bg_fetch { |
|
|
578 | my ($self) = @_; |
|
|
579 | |
|
|
580 | my $id; |
|
|
581 | |
|
|
582 | do { |
|
|
583 | $id = pop @{$self->{bg_fetch}} |
|
|
584 | or return; |
|
|
585 | } while $self->{texture}[$id]; |
|
|
586 | |
|
|
587 | CFPlus::DB::get tilecache => $id, sub { |
|
|
588 | my ($data) = @_; |
|
|
589 | |
|
|
590 | return unless $self->{map}; # stop when destroyed |
|
|
591 | |
|
|
592 | $self->set_texture ($id => $data) |
|
|
593 | if defined $data; |
|
|
594 | |
|
|
595 | $self->bg_fetch; |
|
|
596 | }; |
|
|
597 | } |
393 | |
598 | |
394 | sub load_map($$$) { |
599 | sub load_map($$$) { |
395 | my ($self, $hash, $x, $y) = @_; |
600 | my ($self, $hash, $x, $y) = @_; |
396 | |
601 | |
397 | if (defined (my $data = $self->{mapcache}->get ($hash))) { |
602 | my $gen = $self->{map_change_gen}; |
|
|
603 | |
|
|
604 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
|
|
605 | return unless $gen == $self->{map_change_gen}; |
|
|
606 | |
|
|
607 | my ($data) = @_; |
|
|
608 | |
|
|
609 | if (defined $data) { |
398 | $data = Compress::LZF::decompress $data; |
610 | $data = Compress::LZF::decompress $data; |
399 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
611 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
400 | for my $id ($self->{map}->set_rect ($x, $y, $data)) { |
|
|
401 | my $data = $self->{tilecache}->get ($id) |
|
|
402 | or next; |
|
|
403 | |
612 | |
404 | $self->set_texture ($id => $data); |
613 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
|
|
614 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
|
|
615 | $self->bg_fetch unless $inprogress; |
405 | } |
616 | } |
406 | } |
617 | }; |
407 | } |
618 | } |
408 | |
619 | |
409 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
620 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
410 | # (server resource,s latency, bandwidth), so this hack is warranted. |
621 | # (server resource,s latency, bandwidth), so this hack is warranted. |
411 | # the right fix is to make real tiled maps with an overview file |
622 | # the right fix is to make real tiled maps with an overview file |
… | |
… | |
475 | |
686 | |
476 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
687 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
477 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
688 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
478 | |
689 | |
479 | } else { |
690 | } else { |
|
|
691 | my $gen = $self->{map_change_gen}; |
480 | $self->send_mapinfo ("spatial $path$tile", sub { |
692 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
693 | return unless $gen == $self->{map_change_gen}; |
|
|
694 | |
481 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
695 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
482 | |
696 | |
483 | return if $mode ne "spatial"; |
697 | return if $mode ne "spatial"; |
484 | |
698 | |
485 | $x += $self->{map}->ox; |
699 | $x += $self->{map}->ox; |
… | |
… | |
499 | |
713 | |
500 | sub map_change { |
714 | sub map_change { |
501 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
715 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
502 | |
716 | |
503 | $self->flush_map; |
717 | $self->flush_map; |
|
|
718 | |
|
|
719 | ++$self->{map_change_gen}; |
504 | |
720 | |
505 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
721 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
506 | |
722 | |
507 | my $mapmapw = $self->{mapmap}->{w}; |
723 | my $mapmapw = $self->{mapmap}->{w}; |
508 | my $mapmaph = $self->{mapmap}->{h}; |
724 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
525 | $self->load_map ($hash, $x, $y); |
741 | $self->load_map ($hash, $x, $y); |
526 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
742 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
527 | } |
743 | } |
528 | |
744 | |
529 | sub face_find { |
745 | sub face_find { |
530 | my ($self, $facenum, $face) = @_; |
746 | my ($self, $facenum, $face, $cb) = @_; |
531 | |
747 | |
532 | my $hash = "$face->{chksum},$face->{name}"; |
748 | my $hash = "$face->{chksum},$face->{name}"; |
533 | |
749 | |
534 | my $id = $self->{facemap}->get ($hash); |
750 | my $id = CFPlus::DB::get_tile_id_sync $hash; |
535 | |
751 | |
536 | unless ($id) { |
|
|
537 | # create new id for face |
|
|
538 | # I love transactions |
|
|
539 | for (1..100) { |
|
|
540 | my $txn = $CFPlus::DB_ENV->txn_begin; |
|
|
541 | my $status = $self->{facemap}->db_get (id => $id); |
|
|
542 | if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { |
|
|
543 | $id = ($id || 64) + 1; |
|
|
544 | if ($self->{facemap}->put (id => $id) == 0 |
|
|
545 | && $self->{facemap}->put ($hash => $id) == 0) { |
|
|
546 | $txn->txn_commit; |
|
|
547 | |
|
|
548 | goto gotid; |
|
|
549 | } |
|
|
550 | } |
|
|
551 | $txn->txn_abort; |
|
|
552 | } |
|
|
553 | |
|
|
554 | CFPlus::fatal "maximum number of transaction retries reached - database problems?"; |
|
|
555 | } |
|
|
556 | |
|
|
557 | gotid: |
|
|
558 | $face->{id} = $id; |
752 | $face->{id} = $id; |
559 | $self->{map}->set_face ($facenum => $id); |
|
|
560 | $self->{faceid}[$facenum] = $id;#d# |
753 | $self->{faceid}[$facenum] = $id; |
561 | |
754 | |
562 | my $face = $self->{tilecache}->get ($id); |
755 | $self->{map}->set_tileid ($facenum => $id); |
563 | |
756 | |
564 | if ($face) { |
757 | CFPlus::DB::get tilecache => $id, $cb; |
565 | #$self->face_prefetch; |
|
|
566 | $face |
|
|
567 | } else { |
|
|
568 | my $tex = $self->{noface}; |
|
|
569 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
570 | undef |
|
|
571 | }; |
|
|
572 | } |
758 | } |
573 | |
759 | |
574 | sub face_update { |
760 | sub face_update { |
575 | my ($self, $facenum, $face, $changed) = @_; |
761 | my ($self, $facenum, $face, $changed) = @_; |
576 | |
762 | |
577 | $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; |
763 | CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } |
|
|
764 | if $changed; |
578 | |
765 | |
579 | $self->set_texture ($face->{id} => delete $face->{image}); |
766 | $self->set_texture ($face->{id} => delete $face->{image}); |
|
|
767 | } |
|
|
768 | |
|
|
769 | sub smooth_update { |
|
|
770 | my ($self, $facenum, $face) = @_; |
|
|
771 | |
|
|
772 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
580 | } |
773 | } |
581 | |
774 | |
582 | sub set_texture { |
775 | sub set_texture { |
583 | my ($self, $id, $data) = @_; |
776 | my ($self, $id, $data) = @_; |
584 | |
777 | |
|
|
778 | return unless $self->{map}; |
|
|
779 | |
585 | $self->{texture}[$id] ||= do { |
780 | $self->{texture}[$id] = my $tex = |
586 | my $tex = |
|
|
587 | new_from_image CFPlus::Texture |
781 | new_from_image CFPlus::Texture |
588 | $data, minify => 1, mipmap => 1; |
782 | $data, minify => 1, mipmap => 1; |
589 | |
783 | |
590 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
784 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
591 | $self->{map_widget}->update; |
785 | $self->{map_widget}->update; |
592 | |
786 | |
593 | $tex |
787 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
|
|
788 | } |
|
|
789 | |
|
|
790 | sub connect_face_update { |
|
|
791 | my ($self, $id, $cb) = @_; |
|
|
792 | |
|
|
793 | push @{$self->{face_cb}{$id}}, $cb; |
|
|
794 | |
|
|
795 | CFPlus::guard { |
|
|
796 | @{$self->{face_cb}{$id}} |
|
|
797 | = grep $_ != $cb, |
|
|
798 | @{$self->{face_cb}{$id}}; |
594 | }; |
799 | } |
595 | } |
800 | } |
596 | |
801 | |
597 | sub sound_play { |
802 | sub sound_play { |
598 | my ($self, $x, $y, $soundnum, $type) = @_; |
803 | my ($self, $x, $y, $soundnum, $type) = @_; |
599 | |
804 | |
… | |
… | |
609 | $LAST_QUERY = $prompt; |
814 | $LAST_QUERY = $prompt; |
610 | |
815 | |
611 | $self->{query}-> ($self, $flags, $prompt); |
816 | $self->{query}-> ($self, $flags, $prompt); |
612 | } |
817 | } |
613 | |
818 | |
614 | sub drawinfo { |
819 | sub sanitise_xml($) { |
615 | my ($self, $color, $text) = @_; |
820 | local $_ = shift; |
616 | |
821 | |
617 | my @color = ( |
822 | # we now weed out all tags we do not support |
|
|
823 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
824 | # now all entities |
|
|
825 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
826 | |
|
|
827 | # handle some elements |
|
|
828 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
829 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
830 | |
|
|
831 | $_ |
|
|
832 | } |
|
|
833 | |
|
|
834 | our %NAME_TO_COLOR = ( |
|
|
835 | black => 0, |
|
|
836 | white => 1, |
|
|
837 | darkblue => 2, |
|
|
838 | red => 3, |
|
|
839 | orange => 4, |
|
|
840 | lightblue => 5, |
|
|
841 | darkorange => 6, |
|
|
842 | green => 7, |
|
|
843 | darkgreen => 8, |
|
|
844 | grey => 9, |
|
|
845 | brown => 10, |
|
|
846 | yellow => 11, |
|
|
847 | tan => 12, |
|
|
848 | ); |
|
|
849 | |
|
|
850 | our @CF_COLOR = ( |
618 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
851 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
619 | [1.00, 1.00, 1.00], |
852 | [1.00, 1.00, 1.00], |
620 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
853 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
621 | [1.00, 0.00, 0.00], |
854 | [1.00, 0.00, 0.00], |
622 | [1.00, 0.54, 0.00], |
855 | [1.00, 0.54, 0.00], |
623 | [0.11, 0.56, 1.00], |
856 | [0.11, 0.56, 1.00], |
624 | [0.93, 0.46, 0.00], |
857 | [0.93, 0.46, 0.00], |
625 | [0.18, 0.54, 0.34], |
858 | [0.18, 0.54, 0.34], |
626 | [0.56, 0.73, 0.56], |
859 | [0.56, 0.73, 0.56], |
627 | [0.80, 0.80, 0.80], |
860 | [0.80, 0.80, 0.80], |
628 | [0.75, 0.61, 0.20], |
861 | [0.75, 0.61, 0.20], |
629 | [0.99, 0.77, 0.26], |
862 | [0.99, 0.77, 0.26], |
630 | [0.74, 0.65, 0.41], |
863 | [0.74, 0.65, 0.41], |
631 | ); |
864 | ); |
632 | |
865 | |
633 | my $fg = $color[$color % @color]; |
866 | sub msg { |
|
|
867 | my ($self, $color, $type, $text, @extra) = @_; |
634 | |
868 | |
|
|
869 | $text = sanitise_xml $text; |
|
|
870 | |
|
|
871 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
872 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
873 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
874 | $type =~ s/-/_/g; |
|
|
875 | $self->{$type} = $text; |
|
|
876 | } else { |
635 | $self->logprint ("info: ", $text); |
877 | $self->logprint ("msg: ", $text); |
|
|
878 | return if $color < 0; # negative color == ignore if not understood |
636 | |
879 | |
|
|
880 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
|
|
881 | |
637 | # try to create single paragraphs of multiple lines sent by the server |
882 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
883 | # no longer neecssary with TRT servers |
638 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
884 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
639 | |
885 | |
640 | $text = CFPlus::asxml $text; |
|
|
641 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
|
|
642 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
|
|
643 | |
|
|
644 | ::message ({ fg => $fg, markup => $_ }) |
886 | ::message ({ fg => $fg, markup => $_ }) |
645 | for split /\n/, $text; |
887 | for split /\n/, $text; |
646 | |
888 | |
647 | $self->{statusbox}->add ($text, |
889 | $self->{statusbox}->add ($text, |
648 | group => $text, |
890 | group => $text, |
649 | fg => $fg, |
891 | fg => $fg, |
650 | timeout => $color >= 2 ? 180 : 10, |
892 | timeout => $color >= 2 ? 180 : 10, |
651 | tooltip_font => $::FONT_FIXED, |
893 | tooltip_font => $::FONT_FIXED, |
652 | ); |
894 | ); |
653 | } |
895 | } |
654 | |
|
|
655 | sub drawextinfo { |
|
|
656 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
657 | |
|
|
658 | $self->drawinfo ($color, $message); |
|
|
659 | } |
896 | } |
660 | |
897 | |
661 | sub spell_add { |
898 | sub spell_add { |
662 | my ($self, $spell) = @_; |
899 | my ($self, $spell) = @_; |
663 | |
900 | |
… | |
… | |
679 | } |
916 | } |
680 | |
917 | |
681 | sub setup { |
918 | sub setup { |
682 | my ($self, $setup) = @_; |
919 | my ($self, $setup) = @_; |
683 | |
920 | |
|
|
921 | $self->{map_widget}->set_tilesize ($self->{tilesize}); |
684 | $::MAP->resize ($self->{mapw}, $self->{maph}); |
922 | $::MAP->resize ($self->{mapw}, $self->{maph}); |
685 | } |
923 | } |
686 | |
924 | |
687 | sub addme_success { |
925 | sub addme_success { |
688 | my ($self) = @_; |
926 | my ($self) = @_; |
… | |
… | |
895 | $::SERVER_INFO->set_markup ( |
1133 | $::SERVER_INFO->set_markup ( |
896 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1134 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
897 | . "protocol version <tt>$self->{version}</tt>\n" |
1135 | . "protocol version <tt>$self->{version}</tt>\n" |
898 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1136 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
899 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1137 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
1138 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
900 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1139 | . "editing support $yesno[!!$self->{editor_support}]\n" |
901 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1140 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
1141 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
902 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1142 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
903 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1143 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
904 | . "map size $self->{mapw}×$self->{maph}\n" |
1144 | . "map size $self->{mapw}×$self->{maph}\n" |
905 | ); |
1145 | ); |
906 | |
1146 | |
… | |
… | |
928 | |
1168 | |
929 | $self->update_server_info; |
1169 | $self->update_server_info; |
930 | |
1170 | |
931 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1171 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
932 | $self->send_command ("output-count $::CFG->{output_count}"); |
1172 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
1173 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
933 | $self->send_command ("pickup $::CFG->{pickup}"); |
1174 | $self->send_command ("pickup $::CFG->{pickup}"); |
934 | } |
1175 | } |
935 | |
1176 | |
936 | sub buildat { |
1177 | sub buildat { |
937 | my ($self, $builditem, $x, $y) = @_; |
1178 | my ($self, $builditem, $x, $y) = @_; |
… | |
… | |
968 | |
1209 | |
969 | (delete $self->{npc_dialog})->destroy |
1210 | (delete $self->{npc_dialog})->destroy |
970 | if $self->{npc_dialog}; |
1211 | if $self->{npc_dialog}; |
971 | |
1212 | |
972 | $self->SUPER::destroy; |
1213 | $self->SUPER::destroy; |
|
|
1214 | |
|
|
1215 | %$self = (); |
973 | } |
1216 | } |
974 | |
1217 | |
975 | package CFPlus::NPCDialog; |
1218 | package CFPlus::NPCDialog; |
976 | |
1219 | |
977 | our @ISA = 'CFPlus::UI::Toplevel'; |
1220 | our @ISA = 'CFPlus::UI::Toplevel'; |
… | |
… | |
1068 | |
1311 | |
1069 | if ($msg->{msgtype} eq "reply") { |
1312 | if ($msg->{msgtype} eq "reply") { |
1070 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1313 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1071 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1314 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1072 | |
1315 | |
1073 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
1316 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
1074 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1317 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1075 | my @link; |
1318 | my @link; |
1076 | $text =~ s{ |
1319 | $text =~ s{ |
1077 | ($match) |
1320 | ($match) |
1078 | }{ |
1321 | }{ |