ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.153 by root, Thu Apr 20 09:13:32 2006 UTC vs.
Revision 1.166 by elmex, Sun Apr 23 02:50:44 2006 UTC

… …
45our $LOGVIEW; 45our $LOGVIEW;
46our $CONSOLE; 46our $CONSOLE;
47our $METASERVER; 47our $METASERVER;
48 48
49our $GAUGES; 49our $GAUGES;
50our $STATWIDS;
50 51
51our $SDL_ACTIVE; 52our $SDL_ACTIVE;
52our %SDL_CB; 53our %SDL_CB;
53 54
54our $SDL_MIXER; 55our $SDL_MIXER;
… …
116 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 117 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
117 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 118 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
118 }); 119 });
119 $mode_slider->emit (changed => $mode_slider->{range}[0]); 120 $mode_slider->emit (changed => $mode_slider->{range}[0]);
120 121
122 my $row = 1;
123
121 $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 124 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
122 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 125 $table->add (1, $row++, new CFClient::UI::CheckBox
126 state => $CFG->{fullscreen},
127 tooltip => "Bring the client into fullscreen mode",
128 connect_changed => sub {
123 my ($self, $value) = @_; 129 my ($self, $value) = @_;
124 $CFG->{fullscreen} = $value; 130 $CFG->{fullscreen} = $value;
131 }
125 }); 132 );
126 133
127 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 134 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
128 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub { 135 $table->add (1, $row++, new CFClient::UI::CheckBox
136 state => $CFG->{fast},
137 tooltip => "Lower the visual quality considerably to speed up rendering.",
138 connect_changed => sub {
129 my ($self, $value) = @_; 139 my ($self, $value) = @_;
130 $CFG->{fast} = $value; 140 $CFG->{fast} = $value;
141 }
131 }); 142 );
132 143
133 $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 144 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
134 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub { 145 $table->add (1, $row++, new CFClient::UI::CheckBox
146 state => $CFG->{fow_enable},
147 tooltip => "Fog-of-War marks areas that cannot be seen by the player",
148 connect_changed => sub {
135 my ($self, $value) = @_; 149 my ($self, $value) = @_;
136 $CFG->{fow_enable} = $value; 150 $CFG->{fow_enable} = $value;
151 }
137 }); 152 );
138 153
139 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 154 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
140 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub { 155 $table->add (1, $row++, new CFClient::UI::Slider
156 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
157 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
158 connect_changed => sub {
141 my ($self, $value) = @_; 159 my ($self, $value) = @_;
142 $CFG->{fow_intensity} = $value; 160 $CFG->{fow_intensity} = $value;
161 }
143 }); 162 );
144 163
145 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 164 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
146 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub { 165 $table->add (1, $row++, new CFClient::UI::CheckBox
166 state => $CFG->{fow_smooth},
167 tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
168 connect_changed => sub {
147 my ($self, $value) = @_; 169 my ($self, $value) = @_;
148 $CFG->{fow_smooth} = $value; 170 $CFG->{fow_smooth} = $value;
149 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 171 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
172 }
150 }); 173 );
151 174
152 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 175 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
153 $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 176 $table->add (1, $row++, new CFClient::UI::Slider
177 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
178 tooltip => "The font size used by most GUI elements",
179 connect_changed => sub {
154 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10; 180 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
155# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 181# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
182 }
156 }); 183 );
157 184
158 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 185 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
159 $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub { 186 $table->add (1, $row++, new CFClient::UI::Slider
187 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
188 tooltip => "The font size used by the server log window only",
189 connect_changed => sub {
160 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10); 190 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
191 }
161 }); 192 );
162 193
163 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 194 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
195
196 $table->add (1, $row++, new CFClient::UI::Slider
197 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
198 tooltip => "The font size used by the statistics window only",
199 connect_changed => sub {
200 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
201 &set_stats_window_fontsize;
202 }
203 );
204
205 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
206 $table->add (1, $row++, new CFClient::UI::Slider
207 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
208 tooltip => "Adjust the size of the stats gauges at the bottom right",
209 connect_changed => sub {
210 $CFG->{gauge_size} = $_[1];
211 my $h = int $HEIGHT * $CFG->{gauge_size};
212 $GAUGES->{win}->set_size ($WIDTH, $h);
213 $GAUGES->{win}->move (0, $HEIGHT - $h);
214 }
215 );
216
217 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
218 $table->add (1, $row++, new CFClient::UI::Slider
219 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
220 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
221 connect_changed => sub {
222 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
223 &set_gauge_window_fontsize;
224 #$GAUGES->{win}->check_size;
225 #$GAUGES->{win}->update;
226 }
227 );
228
229 $table->add (1, $row++, new CFClient::UI::Button
230 expand => 1, align => 0, text => "Apply",
231 tooltip => "Apply the video settings (unless they are auto-apply)",
232 connect_activate => sub {
164 video_shutdown (); 233 video_shutdown ();
165 video_init (); 234 video_init ();
235 }
166 }); 236 );
167 237
168 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 238 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
169 $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub { 239 $table->add (1, $row++, new CFClient::UI::CheckBox
240 state => $CFG->{audio_enable},
241 tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
242 connect_changed => sub {
170 $CFG->{audio_enable} = $_[1]; 243 $CFG->{audio_enable} = $_[1];
244 }
171 }); 245 );
172# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 246# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
173# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 247# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
174# $CFG->{effects_volume} = $_[1]; 248# $CFG->{effects_volume} = $_[1];
175# }); 249# });
176 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 250 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
177 $table->add (1, 10, my $hbox = new CFClient::UI::HBox); 251 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
178 $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub { 252 $hbox->add (new CFClient::UI::CheckBox
253 expand => 1, state => $CFG->{bgm_enable},
254 tooltip => "Enable background music playing",
255 connect_changed => sub {
179 $CFG->{bgm_enable} = $_[1]; 256 $CFG->{bgm_enable} = $_[1];
257 }
180 }); 258 );
181 $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub { 259 $hbox->add (new CFClient::UI::Slider
260 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
261 tooltip => "The volume of the background music",
262 connect_changed => sub {
182 $CFG->{bgm_volume} = $_[1]; 263 $CFG->{bgm_volume} = $_[1];
183 CFClient::MixMusic::volume $_[1] * 128; 264 CFClient::MixMusic::volume $_[1] * 128;
265 }
184 }); 266 );
185 267
186 $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 268 $table->add (1, $row++, new CFClient::UI::Button
269 expand => 1, align => 0, text => "Apply",
270 tooltip => "Apply the audio settings that are not auto-apply",
271 connect_activate => sub {
187 audio_shutdown (); 272 audio_shutdown ();
188 audio_init (); 273 audio_init ();
274 }
189 }); 275 );
190 276
191 $dialog 277 $dialog
278}
279
280sub set_stats_window_fontsize {
281 for (values %{$STATWIDS}) {
282 $_->set_fontsize ($::CFG->{stat_fontsize});
283 }
284}
285
286sub set_gauge_window_fontsize {
287 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
288 $_->set_fontsize ($::CFG->{gauge_fontsize});
289 }
290}
291
292sub make_gauge_window {
293 my $gh = int ($HEIGHT * $CFG->{gauge_size});
294# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
295
296 my $win = new CFClient::UI::Frame (
297 y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
298 );
299 $win->add (my $vb = new CFClient::UI::VBox);
300
301 $vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
302
303
304 $hbg->add (new CFClient::UI::Empty expand => 1);
305 $hbg->add (my $hb = new CFClient::UI::HBox);
306 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
307 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
308 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
309 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
310
311 $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
312 $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
313
314 $GAUGES = {
315 exp => $exp, win => $win, range => $rng,
316 food => $fg, mana => $mg, hp => $hg, grace => $gg
317 };
318 $win
319}
320
321sub make_stats_window {
322 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
323
324 $tgw->add (my $vb = new CFClient::UI::VBox);
325 $vb->add (my $uhb = new CFClient::UI::HBox);
326 $uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
327 $uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
328
329 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
330
331 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
332
333 $tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str");
334 $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");
335 $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");
336 $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");
337 $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");
338 $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");
339 $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");
340
341 $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => "");
342 $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => "");
343 $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => "");
344 $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => "");
345 $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => "");
346 $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => "");
347 $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => "");
348
349 $tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
350 $tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
351 $tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
352 $tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
353 $tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
354 $tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
355
356 $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => "");
357 $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => "");
358 $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => "");
359 $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => "");
360 $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
361 $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
362
363 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
364
365 my $row = 0;
366 my $col = 0;
367
368 my %resist_names = (
369 slow => "Slow",
370 holyw => "Holy Word",
371 conf => "Confusion",
372 fire => "Fire",
373 depl => "Depletion",
374 magic => "Magic",
375 drain => "Draining",
376 acid => "Acid",
377 pois => "Poison",
378 para => "Paralysation",
379 deat => "Death",
380 phys => "Physical",
381 blind => "Blind",
382 fear => "Fear",
383 tund => "Turn undead",
384 elec => "Electricity",
385 cold => "Cold",
386 ghit => "Ghost hit",
387 );
388 for (qw/slow holyw conf fire depl magic
389 drain acid pois para deat phys
390 blind fear tund elec cold ghit/)
391 {
392 $tbl2->add ($col, $row,
393 $STATWIDS->{"res_$_"} =
394 new CFClient::UI::Label text => "0", align => +1, valign => 0
395 );
396 $tbl2->add ($col + 1, $row, new CFClient::UI::Image can_hover => 1, can_events => 1, image => "ui/resist/resist_$_.png", tooltip => $resist_names{$_});
397
398 $row++;
399 if ($row % 6 == 0) {
400 $col += 2;
401 $row = 0;
402 }
403 }
404
405 &set_stats_window_fontsize;
406 update_stats_window ({});
407
408 $tgw
409}
410
411sub update_stats_window {
412 my ($stats) = @_;
413
414 # i love text protocols!!!
415 my $hp = $stats->{1} * 1;
416 my $hp_m = $stats->{2} * 1;
417 my $sp = $stats->{3} * 1;
418 my $sp_m = $stats->{4} * 1;
419 my $fo = $stats->{18} * 1;
420 my $fo_m = 999;
421 my $gr = $stats->{23} * 1;
422 my $gr_m = $stats->{24} * 1;
423
424 $GAUGES->{hp} ->set_value ($hp, $hp_m);
425 $GAUGES->{mana} ->set_value ($sp, $sp_m);
426 $GAUGES->{food} ->set_value ($fo, $fo_m);
427 $GAUGES->{grace} ->set_value ($gr, $gr_m);
428 $GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} || $stats->{28}) * 1
429 ." LVL: " . $stats->{12} * 1);
430 my $rng = $stats->{20};
431 $rng =~ s/^Range: //; # thank you so much dear server
432 $GAUGES->{range} ->set_text ("Rng: " . $rng);
433 my $title = $stats->{21};
434 $title =~ s/^Player: //;
435 $STATWIDS->{title} ->set_text ("Title: " . $title);
436
437 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
438 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
439 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
440 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
441 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
442 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
443 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
444 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
445 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
446 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
447 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
448 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
449 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
450
451 my %tbl = (
452 phys => 100,
453 magic => 101,
454 fire => 102,
455 elec => 103,
456 cold => 104,
457 conf => 105,
458 acid => 106,
459 drain => 107,
460 ghit => 108,
461 pois => 109,
462 slow => 110,
463 para => 111,
464 tund => 112,
465 fear => 113,
466 depl => 113,
467 deat => 115,
468 holyw => 116,
469 blind => 117
470 );
471
472 for (keys %tbl) {
473 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
474 }
475
192} 476}
193 477
194sub metaserver_dialog { 478sub metaserver_dialog {
195 my $dialog = new CFClient::UI::FancyFrame 479 my $dialog = new CFClient::UI::FancyFrame
196 title => "Metaserver", 480 title => "Metaserver",
… …
276 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 560 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
277 561
278 { 562 {
279 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 563 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
280 564
281 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub { 565 $vbox->add (
566 my $HOST = new CFClient::UI::Entry
567 expand => 1,
568 text => $CFG->{host},
569 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
570 connect_changed => sub {
571 my ($self, $value) = @_;
572 $CFG->{host} = $value;
573 }
574 );
575
576 $METASERVER = metaserver_dialog;
577
578 $vbox->add (new CFClient::UI::Flopper
579 expand => 1,
580 text => "Metaserver",
581 other => $METASERVER,
582 tooltip => "Show a list of aviable crossfire servers",
583 connect_open => sub {
584 update_metaserver $HOST;
585 }
586 );
587 }
588
589 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
590 $table->add (1, 4, new CFClient::UI::Entry
591 text => $CFG->{user},
592 tooltip => "The name of your character on the server",
593 connect_changed => sub {
282 my ($self, $value) = @_; 594 my ($self, $value) = @_;
283 $CFG->{host} = $value;
284 });
285
286 $METASERVER = metaserver_dialog;
287
288 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
289 update_metaserver $HOST;
290 });
291 }
292
293 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
294 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
295 my ($self, $value) = @_;
296 $CFG->{user} = $value; 595 $CFG->{user} = $value;
596 }
297 }); 597 );
298 598
299 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 599 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
300 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 600 $table->add (1, 5, new CFClient::UI::Entry
601 text => $CFG->{password},
602 hidden => 1,
603 tooltip => "The password for your character",
604 connect_changed => sub {
301 my ($self, $value) = @_; 605 my ($self, $value) = @_;
302 $CFG->{password} = $value; 606 $CFG->{password} = $value;
607 }
303 }); 608 );
304 609
305 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd"); 610 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
306 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub { 611 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
612 text => $CFG->{say_command},
613 tooltip => "This is the command that will be used if you write a line in the message window entry. "
614 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
615 ."But you could also set it to 'tell <playername>' to only chat with that user.",
616 connect_changed => sub {
307 my ($self, $value) = @_; 617 my ($self, $value) = @_;
308 $CFG->{say_command} = $value; 618 $CFG->{say_command} = $value;
619 }
309 }); 620 );
310 621
311 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 622 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
312 $table->add (1, 7, new CFClient::UI::Slider 623 $table->add (1, 7, new CFClient::UI::Slider
313 req_w => 100, 624 req_w => 100,
314 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 625 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
626 tooltip => "This is the size of the portion of the map update the server sends you. "
627 ."If you set this to a high value you will be able to see further for example.",
315 connect_changed => sub { 628 connect_changed => sub {
316 my ($self, $value) = @_; 629 my ($self, $value) = @_;
317 630
318 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 631 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
319 }, 632 },
… …
443 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 756 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
444 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 757 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
445 status "Configuration Saved"; 758 status "Configuration Saved";
446 }); 759 });
447 760
761 $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
762 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
763
448 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 764 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
449 765
450 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0, title => "Stats");
451 $tgw->add (my $hbox = new CFClient::UI::HBox ());
452 766
453 $hbox->add (my $hg = new CFClient::UI::Gauge (type => 'hp'));
454 $hbox->add (my $mg = new CFClient::UI::Gauge (type => 'mana'));
455 $hbox->add (my $gg = new CFClient::UI::Gauge (type => 'grace'));
456 $hbox->add (my $fg = new CFClient::UI::Gauge (type => 'food'));
457
458 $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
459 $CFClient::UI::ROOT->add ($tgw);
460} 767}
461 768
462sub video_shutdown { 769sub video_shutdown {
463 $CFClient::UI::ROOT->{children} = []; 770 $CFClient::UI::ROOT->{children} = [];
464 undef $SDL_ACTIVE; 771 undef $SDL_ACTIVE;
… …
478} 785}
479 786
480sub audio_init { 787sub audio_init {
481 if ($CFG->{audio_enable}) { 788 if ($CFG->{audio_enable}) {
482 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 789 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
483
484 $SDL_MIXER = !CFClient::Mix_OpenAudio; 790 $SDL_MIXER = !CFClient::Mix_OpenAudio;
485 CFClient::Mix_AllocateChannels 8; 791 CFClient::Mix_AllocateChannels 8;
486 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 792 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
487 793
488 audio_music_finished; 794 audio_music_finished;
… …
571@conn::ISA = Crossfire::Protocol::; 877@conn::ISA = Crossfire::Protocol::;
572 878
573sub conn::stats_update { 879sub conn::stats_update {
574 my ($self, $stats) = @_; 880 my ($self, $stats) = @_;
575 881
576 # i love text protocols!!! 882 update_stats_window ($stats);
577 # FIXME: the stats are somehow weird
578 my $hp = $stats->{1};
579 my $hp_m = $stats->{2};
580 my $sp = $stats->{3};
581 my $sp_m = $stats->{4};
582 my $fo = $stats->{18};
583 my $fo_m = 999;
584 my $gr = $stats->{23};
585 my $gr_m = $stats->{24};
586
587 #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
588 $GAUGES->{hp} ->set_value ($hp, $hp_m);
589 $GAUGES->{mana} ->set_value ($sp, $sp_m);
590 $GAUGES->{food} ->set_value ($fo, $fo_m);
591 $GAUGES->{grace}->set_value ($gr, $gr_m);
592} 883}
593 884
594sub conn::user_send { 885sub conn::user_send {
595 my ($self, $command) = @_; 886 my ($self, $command) = @_;
596 887
… …
726 1017
727 $x += $ox; 1018 $x += $ox;
728 $y += $oy; 1019 $y += $oy;
729 1020
730 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1021 $self->{map_info} = [$hash, $x, $y, $w, $h];
1022
1023 my $map = $self->{map_info}[0];
1024 $map =~ s/^.*?\/([^\/]+)$/\1/;
1025 $STATWIDS->{map}->set_text ("Map: " . $map);
731 1026
732 $self->load_map ($hash, $x, $y); 1027 $self->load_map ($hash, $x, $y);
733} 1028}
734 1029
735sub conn::face_find { 1030sub conn::face_find {
… …
899 fast => 0, 1194 fast => 0,
900 fow_enable => 1, 1195 fow_enable => 1,
901 fow_intensity => 0.45, 1196 fow_intensity => 0.45,
902 fow_smooth => 0, 1197 fow_smooth => 0,
903 gui_fontsize => 1, 1198 gui_fontsize => 1,
904 log_fontsize => 14, 1199 log_fontsize => 1,
1200 gauge_fontsize => 1,
1201 gauge_size => 0.35,
1202 stat_fontsize => 1,
905 mapsize => 100, 1203 mapsize => 100,
906 host => "crossfire.schmorp.de", 1204 host => "crossfire.schmorp.de",
907 say_command => 'say', 1205 say_command => 'say',
908 audio_enable => 1, 1206 audio_enable => 1,
909 bgm_enable => 1, 1207 bgm_enable => 1,

Diff Legend

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