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.226 by root, Wed May 17 20:21:28 2006 UTC vs.
Revision 1.246 by root, Wed May 24 22:48:19 2006 UTC

… …
82our $BUTTONBAR; 82our $BUTTONBAR;
83our $LOGVIEW; 83our $LOGVIEW;
84our $CONSOLE; 84our $CONSOLE;
85our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG;
87 88
88our $FLOORBOX; 89our $FLOORBOX;
89our $GAUGES; 90our $GAUGES;
90our $STATWIDS; 91our $STATWIDS;
91 92
… …
105our $INVR; 106our $INVR;
106our $INVR_LBL; 107our $INVR_LBL;
107our $OPENCONT; 108our $OPENCONT;
108 109
109sub status { 110sub status {
110 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
111} 112}
112 113
113sub debug { 114sub debug {
114 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
115 my ($w, $h) = $DEBUG_STATUS->size_request; 116 my ($w, $h) = $DEBUG_STATUS->size_request;
… …
174 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
175 176
176 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
178 179
179 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
180 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 181 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
181 182
182 $mode_slider->connect (changed => sub { 183 $mode_slider->connect (changed => sub {
183 my ($self, $value) = @_; 184 my ($self, $value) = @_;
184 185
… …
209 } 210 }
210 ); 211 );
211 212
212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
213 $table->add (1, $row++, new CFClient::UI::Slider 214 $table->add (1, $row++, new CFClient::UI::Slider
214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05], 215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
215 tooltip => "Enlarge or shrink the displayed map", 216 tooltip => "Enlarge or shrink the displayed map",
216 connect_changed => sub { 217 connect_changed => sub {
217 my ($self, $value) = @_; 218 my ($self, $value) = @_;
218 $CFG->{map_scale} = $value; 219 $CFG->{map_scale} = 2 ** $value;
219 } 220 }
220 ); 221 );
221 222
222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
229 } 230 }
230 ); 231 );
231 232
232 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
233 $table->add (1, $row++, new CFClient::UI::Slider 234 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], 235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
235 tooltip => "The higher the intensity, the lighter the Fog-of-War color", 236 tooltip => "The higher the intensity, the lighter the Fog-of-War color",
236 connect_changed => sub { 237 connect_changed => sub {
237 my ($self, $value) = @_; 238 my ($self, $value) = @_;
238 $CFG->{fow_intensity} = $value; 239 $CFG->{fow_intensity} = $value;
239 } 240 }
… …
250 } 251 }
251 ); 252 );
252 253
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
254 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1], 256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
256 tooltip => "The font size used by most GUI elements", 257 tooltip => "The font size used by most GUI elements",
257 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
258 ); 259 );
259 260
260 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
261 $table->add (1, $row++, new CFClient::UI::Slider 262 $table->add (1, $row++, new CFClient::UI::Slider
262 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1], 263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
263 tooltip => "The font size used by the server log window only", 264 tooltip => "The font size used by the server log window only",
264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
265 ); 266 );
266 267
267 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
268 269
269 $table->add (1, $row++, new CFClient::UI::Slider 270 $table->add (1, $row++, new CFClient::UI::Slider
270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1], 271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
271 tooltip => "The font size used by the statistics window only", 272 tooltip => "The font size used by the statistics window only",
272 connect_changed => sub { 273 connect_changed => sub {
273 $CFG->{stat_fontsize} = $_[1]; 274 $CFG->{stat_fontsize} = $_[1];
274 &set_stats_window_fontsize; 275 &set_stats_window_fontsize;
275 } 276 }
276 ); 277 );
277 278
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
279 $table->add (1, $row++, new CFClient::UI::Slider
280 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
281 tooltip => "Adjust the size of the stats gauges at the bottom right",
282 connect_changed => sub {
283 $CFG->{gauge_size} = $_[1];
284 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
285 }
286 );
287
288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
289 $table->add (1, $row++, new CFClient::UI::Slider 280 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1], 281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
291 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 282 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
292 connect_changed => sub { 283 connect_changed => sub {
293 $CFG->{gauge_fontsize} = $_[1]; 284 $CFG->{gauge_fontsize} = $_[1];
294 &set_gauge_window_fontsize; 285 &set_gauge_window_fontsize;
286 }
287 );
288
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
290 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_size}, 0.2, 0.8],
292 tooltip => "Adjust the size of the stats gauges at the bottom right",
293 connect_changed => sub {
294 $CFG->{gauge_size} = $_[1];
295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
295 } 296 }
296 ); 297 );
297 298
298 $table->add (1, $row++, new CFClient::UI::Button 299 $table->add (1, $row++, new CFClient::UI::Button
299 expand => 1, align => 0, text => "Apply", 300 expand => 1, align => 0, text => "Apply",
… …
324 connect_changed => sub { 325 connect_changed => sub {
325 $CFG->{bgm_enable} = $_[1]; 326 $CFG->{bgm_enable} = $_[1];
326 } 327 }
327 ); 328 );
328 $hbox->add (new CFClient::UI::Slider 329 $hbox->add (new CFClient::UI::Slider
329 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], 330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
330 tooltip => "The volume of the background music", 331 tooltip => "The volume of the background music",
331 connect_changed => sub { 332 connect_changed => sub {
332 $CFG->{bgm_volume} = $_[1]; 333 $CFG->{bgm_volume} = $_[1];
333 CFClient::MixMusic::volume $_[1] * 128; 334 CFClient::MixMusic::volume $_[1] * 128;
334 } 335 }
… …
400 (my $hb = new CFClient::UI::HBox), 401 (my $hb = new CFClient::UI::HBox),
401 ], 402 ],
402 ); 403 );
403 404
404 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 405 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
405 tooltip => "Health points. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment."); 406 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
406 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 407 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
407 tooltip => "Spell points. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana."); 408 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
408 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 409 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
409 tooltip => "Grace points - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods."); 410 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
410 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 411 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
411 tooltip => "Food. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too."); 412 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
412 413
413 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 414 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
414 tooltip => "Experience points and overall level - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100."); 415 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
415 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 416 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
416 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 417 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
417 418
418 $GAUGES = { 419 $GAUGES = {
419 exp => $exp, win => $win, range => $rng, 420 exp => $exp, win => $win, range => $rng,
420 food => $fg, mana => $mg, hp => $hg, grace => $gg 421 food => $fg, mana => $mg, hp => $hg, grace => $gg
421 }; 422 };
… …
424 425
425 $win 426 $win
426} 427}
427 428
428sub make_stats_window { 429sub make_stats_window {
429 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 430 my $tgw = new CFClient::UI::FancyFrame title => "Stats";
430 431
431 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 432 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
432 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 433 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
434 can_hover => 1, can_events => 1,
435 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
433 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 436 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
437 can_hover => 1, can_events => 1,
438 tooltip => "The map you are currently on (if supported by the server).");
434 439
435 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 440 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
436
437 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 441 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
438 442
439 my $black = [0, 0, 0]; 443 my $color2 = [1, 1, 0];
440 444
441 for ( 445 for (
442 [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 446 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
443 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"], 447 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],
444 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"], 448 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],
445 [0, 3, st_int => "Int", 30, "Intelligence, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 449 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],
446 [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 450 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
447 [0, 5, st_pow => "Pow", 30, "Power, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 451 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],
448 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."], 452 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
449 453
450 [2, 0, st_wc => "Wc", -120, "Weapon Class, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 454 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
451 [2, 1, st_ac => "Ac", -120, "Armour Class, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 455 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
452 [2, 2, st_dam => "Dam", 120, "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 456 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
453 [2, 3, st_arm => "Arm", 120, "Armour, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 457 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],
454 [2, 4, st_spd => "Spd", 10.54, "Speed, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 458 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
455 [2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 459 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
456 ) { 460 ) {
457 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 461 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
458 462
459 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 463 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
460 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 464 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
461 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 465 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
462 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip); 466 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
463 } 467 }
464 468
465 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 469 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
466 470
467 my $row = 0; 471 my $row = 0;
468 my $col = 0; 472 my $col = 0;
469 473
470 my %resist_names = ( 474 my %resist_names = (
471 slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 475 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
472 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 476 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
473 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)", 477 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",
474 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 478 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
475 depl => "Depletion (some monsters and other effects can cause stats depletion)", 479 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",
476 magic => "Magic (resistance to magic spells like magic missile or similar)", 480 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",
477 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 481 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
478 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 482 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
479 pois => "Poison (resistance to getting poisoned)", 483 pois => "<b>Poison</b> (resistance to getting poisoned)",
480 para => "Paralysation (this resistance affects the chance you get paralysed)", 484 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
481 deat => "Death (resistance against death spells)", 485 deat => "<b>Death</b> (resistance against death spells)",
482 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 486 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
483 blind => "Blind (blind resistance affects the chance of a successful blinding attack)", 487 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
484 fear => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 488 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
485 tund => "Turn undead", 489 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
486 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)", 490 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
487 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)", 491 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
488 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 492 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
489 ); 493 );
490 for (qw/slow holyw conf fire depl magic 494 for (qw/slow holyw conf fire depl magic
491 drain acid pois para deat phys 495 drain acid pois para deat phys
492 blind fear tund elec cold ghit/) 496 blind fear tund elec cold ghit/)
493 { 497 {
… …
740 ); 744 );
741 745
742 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 746 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
743 $table->add (1, 7, new CFClient::UI::Slider 747 $table->add (1, 7, new CFClient::UI::Slider
744 req_w => 100, 748 req_w => 100,
745 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1], 749 range => [$CFG->{mapsize}, 10, 100, 0, 1],
746 tooltip => "This is the size of the portion of the map update the server sends you. " 750 tooltip => "This is the size of the portion of the map update the server sends you. "
747 ."If you set this to a high value you will be able to see further for example.", 751 . "If you set this to a high value you will be able to see further for example.",
748 connect_changed => sub { 752 connect_changed => sub {
749 my ($self, $value) = @_; 753 my ($self, $value) = @_;
750 754
751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 755 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
752 }, 756 },
… …
781 785
782sub message_window { 786sub message_window {
783 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
784 title => "Messages", 788 title => "Messages",
785 border_bg => [1, 1, 1, 1], 789 border_bg => [1, 1, 1, 1],
786 bg => [0, 0, 0, 0.5], 790 bg => [0, 0, 0, 0.75],
787 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
788 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
789 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
790 794
791 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 795 $vbox->add ($LOGVIEW);
792 expand => 1,
793 font => $FONT_FIXED,
794 fontsize => $::CFG->{log_fontsize},
795 );
796 796
797 $vbox->add (my $input = new CFClient::UI::Entry 797 $vbox->add (my $input = new CFClient::UI::Entry
798 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
799 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
800 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
801 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
798 connect_focus_in => sub { 802 connect_focus_in => sub {
799 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
800 804
801 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
802 806
… …
831 }; 835 };
832 836
833 $window 837 $window
834} 838}
835 839
840sub open_quit_dialog {
841 unless ($QUIT_DIALOG) {
842
843 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
844
845 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
846
847 $vb->add (new CFClient::UI::Label
848 text => "You should find a savebed and apply it first!",
849 max_w => $WIDTH * 0.25,
850 ellipsize => 0,
851 );
852 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
853 $hb->add (new CFClient::UI::Button
854 text => "Ok",
855 expand => 1,
856 connect_activate => sub { $QUIT_DIALOG->hide },
857 );
858 $hb->add (new CFClient::UI::Button
859 text => "Quit anyway",
860 expand => 1,
861 connect_activate => sub { exit },
862 );
863
864 $QUIT_DIALOG->show_centered;
865 } else {
866 $QUIT_DIALOG->show_centered;
867 }
868}
869
836sub make_inventory_window { 870sub make_inventory_window {
837 my $invwin = new CFClient::UI::FancyFrame 871 my $invwin = new CFClient::UI::FancyFrame
838 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory"; 872 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
839 873
840 $invwin->add (my $hb = new CFClient::UI::HBox); 874 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
841 875
842 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 876 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
843 $vb1->add (my $lbl = new CFClient::UI::Label); 877 $vb1->add (my $lbl = new CFClient::UI::Label);
844 $lbl->set_text ("Player"); 878 $lbl->set_text ("Player");
845 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 879 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
… …
850 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 884 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
851 885
852 $invwin 886 $invwin
853} 887}
854 888
889sub make_help_window {
890 my $win = new CFClient::UI::FancyFrame
891 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
892
893 $win->add (my $vbox = new CFClient::UI::VBox);
894
895 $vbox->add (my $buttons = new CFClient::UI::HBox);
896 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
897
898 for (
899 [intro => "Introduction"],
900 [command_help => "Commands"],
901 [skill_help => "Skills"],
902 ) {
903 my ($pod, $label) = @$_;
904
905 $buttons->add (new CFClient::UI::Button
906 text => $label,
907 connect_activate => sub {
908 my $parser = new Pod::POM;
909 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
910
911 $viewer->clear;
912
913 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
914 for @{ CFClient::pod_to_pango_list $pom };
915
916 $viewer->set_offset (0);
917 },
918 );
919 }
920
921 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
922
923 $win
924}
925
855sub sdl_init { 926sub sdl_init {
856 CFClient::SDL_Init 927 CFClient::SDL_Init
857 and die "SDL::Init failed!\n"; 928 and die "SDL::Init failed!\n";
858} 929}
859 930
860sub video_init { 931sub video_init {
861 sdl_init; 932 sdl_init;
862 933
863 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 934 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
864 935
936 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
937
865 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 938 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
866 $FULLSCREEN = $CFG->{fullscreen}; 939 $FULLSCREEN = $CFG->{fullscreen};
867 $FAST = $CFG->{fast}; 940 $FAST = $CFG->{fast};
868 941
869 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 942 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
870 or die "SDL_SetVideoMode failed!\n"; 943 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
871 944
872 $SDL_ACTIVE = 1; 945 $SDL_ACTIVE = 1;
873 $LAST_REFRESH = time - 0.01; 946 $LAST_REFRESH = time - 0.01;
874 947
875 CFClient::gl_init; 948 CFClient::gl_init;
… …
878 951
879 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 952 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
880 953
881 ############################################################################# 954 #############################################################################
882 955
883 unless ($DEBUG_STATUS) { 956 if ($DEBUG_STATUS) {
957 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
958 } else {
884 # create the widgets 959 # create the widgets
885 960
886 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 961 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
887 $DEBUG_STATUS->show; 962 $DEBUG_STATUS->show;
888 963
… …
896 )->show; 971 )->show;
897 972
898 CFClient::UI::FancyFrame->new ( 973 CFClient::UI::FancyFrame->new (
899 border_bg => [1, 1, 1, 192/255], 974 border_bg => [1, 1, 1, 192/255],
900 bg => [1, 1, 1, 0], 975 bg => [1, 1, 1, 0],
901 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 976 child => ($MAPMAP = new CFClient::MapWidget::MapMap
977 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
978 ),
902 )->show; 979 )->show;
903 980
904 $MAPWIDGET = new CFClient::MapWidget; 981 $MAPWIDGET = new CFClient::MapWidget;
905 $MAPWIDGET->connect (activate_console => sub { 982 $MAPWIDGET->connect (activate_console => sub {
906 my ($mapwidget, $preset) = @_; 983 my ($mapwidget, $preset) = @_;
… …
915 } 992 }
916 }); 993 });
917 $MAPWIDGET->show; 994 $MAPWIDGET->show;
918 $MAPWIDGET->focus_in; 995 $MAPWIDGET->focus_in;
919 996
997 $LOGVIEW = new CFClient::UI::TextView
998 expand => 1,
999 font => $FONT_FIXED,
1000 fontsize => $::CFG->{log_fontsize},
1001 can_hover => 1,
1002 can_events => 1,
1003 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1004 ;
1005
920 $BUTTONBAR = new CFClient::UI::HBox; 1006 $BUTTONBAR = new CFClient::UI::HBox;
921 1007
922 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 1008 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1009 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
923 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 1010 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1011 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
924 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 1012 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1013 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
925 1014
926 make_gauge_window->show; # 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 1015 make_gauge_window->show; # 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
927 1016
928 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 1017 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1018 tooltip => "Toggles the statistics window, where all your Stats and Resistances are beign displaye at all times.");
929 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 1019 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1020 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
930 1021
931 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 1022 $BUTTONBAR->add (new CFClient::UI::Button
1023 text => "Save Config",
1024 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1025 connect_activate => sub {
932 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1026 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
933 status "Configuration Saved"; 1027 status "Configuration Saved";
1028 },
934 }); 1029 );
1030
1031 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1032 tooltip => "View Documentation");
1033
1034 $BUTTONBAR->add (new CFClient::UI::Button
1035 text => "Quit",
1036 tooltip => "Terminates the program",
1037 connect_activate => sub {
1038 if ($CONN) {
1039 open_quit_dialog;
1040 } else {
1041 exit;
1042 }
1043 },
1044 );
935 1045
936 $BUTTONBAR->show; 1046 $BUTTONBAR->show;
937 1047
938 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1048 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
939 1049
… …
972 1082
973sub audio_init { 1083sub audio_init {
974 if ($CFG->{audio_enable}) { 1084 if ($CFG->{audio_enable}) {
975 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1085 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
976 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1086 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1087
1088 unless ($SDL_MIXER) {
1089 status "Unable to open sound device: there will be no sound";
1090 return;
1091 }
1092
977 CFClient::Mix_AllocateChannels 8; 1093 CFClient::Mix_AllocateChannels 8;
978 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1094 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
979 1095
980 audio_music_finished; 1096 audio_music_finished;
981 1097
… …
1009my %animate_object; 1125my %animate_object;
1010my $animate_timer; 1126my $animate_timer;
1011 1127
1012my $fps = 9; 1128my $fps = 9;
1013 1129
1130my %demo;#d#
1131
1014sub force_refresh { 1132sub force_refresh {
1015 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1133 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1016 debug sprintf "%3.2f", $fps; 1134 debug sprintf "%3.2f", $fps;
1017 1135
1018 $CFClient::UI::ROOT->draw; 1136 $CFClient::UI::ROOT->draw;
1019 CFClient::SDL_GL_SwapBuffers;
1020 1137
1021 $WANT_REFRESH = 0; 1138 $WANT_REFRESH = 0;
1022 $CAN_REFRESH = 0; 1139 $CAN_REFRESH = 0;
1023 $LAST_REFRESH = $NOW; 1140 $LAST_REFRESH = $NOW;
1141
11420 && do {
1143 # some weird model-drawing code, just a joke right now
1144 use CFClient::OpenGL;
1145
1146 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1147 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1148 $demo{r} ||= do {
1149 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1150 $mod->{v} = pack "f*", @{$mod->{v}};
1151 $_ = [scalar @$_, pack "S!*", @$_]
1152 for values %{$mod->{g}};
1153 $mod
1154 };
1155
1156 my $r = $demo{r} or die;
1157
1158 glDepthMask 1;
1159 glClear GL_DEPTH_BUFFER_BIT;
1160 glEnable GL_TEXTURE_2D;
1161 glEnable GL_DEPTH_TEST;
1162 glEnable GL_CULL_FACE;
1163 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1164
1165 glMatrixMode GL_PROJECTION;
1166 glLoadIdentity;
1167 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1168 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1169 glMatrixMode GL_MODELVIEW;
1170 glLoadIdentity;
1171
1172 glPushMatrix;
1173 glTranslate 0, 0, -800;
1174 glScale 1, -1, 1;
1175 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1176 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1177 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1178 glScale 50, 50, 50;
1179
1180 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1181 while (my ($k, $v) = each %{$r->{g}}) {
1182 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1183 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1184 }
1185
1186 glPopMatrix;
1187
1188 glShadeModel GL_FLAT;
1189 glDisable GL_DEPTH_TEST;
1190 glDisable GL_TEXTURE_2D;
1191 glDepthMask 0;
1192
1193 $WANT_REFRESH++;
1194};
1195
1196 CFClient::SDL_GL_SwapBuffers;
1024} 1197}
1025 1198
1026my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1199my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
1027 $NOW = time; 1200 $NOW = time;
1028 1201
… …
1077 $arg = $arg eq ".*" ? "" : " $arg"; 1250 $arg = $arg eq ".*" ? "" : " $arg";
1078 1251
1079 $MAPWIDGET->add_command ("$cmd$arg", $text); 1252 $MAPWIDGET->add_command ("$cmd$arg", $text);
1080 } 1253 }
1081 } 1254 }
1255
1256 $self->{noface} = new_from_file CFClient::Texture
1257 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1082 1258
1083 $self 1259 $self
1084} 1260}
1085 1261
1086sub conn::stats_update { 1262sub conn::stats_update {
… …
1154 $self->set_texture ($id => $data); 1330 $self->set_texture ($id => $data);
1155 } 1331 }
1156 } 1332 }
1157} 1333}
1158 1334
1335# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1336# (server resource,s latency, bandwidth), so this hack is warranted.
1337# the right fix is to make real tiled maps with an overview file
1338sub conn::send_mapinfo {
1339 my ($self, $data, $cb) = @_;
1340
1341 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1342 my ($wx, $wy) = ($1, $2);
1343
1344 if ($data =~ /^spatial ([1-4]+)$/) {
1345 my @dx = (0, 0, 1, 0, -1);
1346 my @dy = (0, -1, 0, 1, 0);
1347 my ($dx, $dy);
1348
1349 for (split //, $1) {
1350 $dx += $dx[$_];
1351 $dy += $dy[$_];
1352 }
1353
1354 $cb->(spatial => 15,
1355 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1356 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1357 50, 50,
1358 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1359 );
1360
1361 return;
1362 }
1363 }
1364
1365 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1366}
1367
1159# this method does a "flood fill" into every tile direction 1368# this method does a "flood fill" into every tile direction
1160# it assumes that tiles are arranged in a rectangular grid, 1369# it assumes that tiles are arranged in a rectangular grid,
1161# i.e. a map is the same as the left of the right map etc. 1370# i.e. a map is the same as the left of the right map etc.
1162# failure to comply are harmless and result in display errors 1371# failure to comply are harmless and result in display errors
1163# at worst. 1372# at worst.
1164sub conn::flood_fill { 1373sub conn::flood_fill {
1165 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1374 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1166 1375
1167 # the server does not allow map paths > 6 1376 # the server does not allow map paths > 6
1168 return if 7 <= length $path; 1377 return if 7 <= length $path;
1169 1378
1170 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1379 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1171 1380
1172 for ( 1381 for (
1173 [1, 0, -1], 1382 [1, 3, 0, -1],
1174 [2, 1, 0], 1383 [2, 4, 1, 0],
1175 [3, 0, 1], 1384 [3, 1, 0, 1],
1176 [4, -1, 0], 1385 [4, 2, -1, 0],
1177 ) { 1386 ) {
1178 my ($tile, $dx, $dy) = @$_; 1387 my ($tile, $tile2, $dx, $dy) = @$_;
1388
1389 next if $block & (1 << $tile);
1390 my $block = $block | (1 << $tile2);
1179 1391
1180 my $gx = $gx + $dx; 1392 my $gx = $gx + $dx;
1181 my $gy = $gy + $dy; 1393 my $gy = $gy + $dy;
1182 1394
1183 next unless $flags & (1 << ($tile - 1)); 1395 next unless $flags & (1 << ($tile - 1));
… …
1185 1397
1186 my $neigh = $self->{neigh_map}{$hash} ||= []; 1398 my $neigh = $self->{neigh_map}{$hash} ||= [];
1187 if (my $info = $neigh->[$tile]) { 1399 if (my $info = $neigh->[$tile]) {
1188 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1400 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1189 1401
1190 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1402 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1191 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1403 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1192 1404
1193 } else { 1405 } else {
1194 $self->send_mapinfo ("spatial $path$tile", sub { 1406 $self->send_mapinfo ("spatial $path$tile", sub {
1195 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1407 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1196 1408
1197 return if $mode ne "spatial"; 1409 return if $mode ne "spatial";
1198 1410
1199 $x += $MAP->ox; 1411 $x += $MAP->ox;
1200 $y += $MAP->oy; 1412 $y += $MAP->oy;
1201 1413
1202 $self->load_map ($hash, $x, $y) 1414 $self->load_map ($hash, $x, $y)
1203 unless $self->{neigh_map}{$hash}[5]++;#d# 1415 unless $self->{neigh_map}{$hash}[5]++;#d#
1204 1416
1205 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1417 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1206 1418
1207 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1419 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1208 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1420 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1209 }); 1421 });
1210 } 1422 }
1211 } 1423 }
1212} 1424}
… …
1225 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1437 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1226 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1438 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1227 ]; 1439 ];
1228 1440
1229 delete $self->{neigh_grid}; 1441 delete $self->{neigh_grid};
1230 $self->flood_fill (0, 0, "", $hash, $flags);
1231 1442
1232 $x += $ox; 1443 $x += $ox;
1233 $y += $oy; 1444 $y += $oy;
1234 1445
1235 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1446 $self->{map_info} = [$hash, $x, $y, $w, $h];
1236 1447
1237 my $map = $self->{map_info}[0];
1238 $map =~ s/^.*?\/([^\/]+)$/\1/; 1448 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1239 $STATWIDS->{map}->set_text ("Map: " . $map); 1449 $STATWIDS->{map}->set_text ("Map: " . $map);
1240 1450
1241 $self->load_map ($hash, $x, $y); 1451 $self->load_map ($hash, $x, $y);
1452 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1242} 1453}
1243 1454
1244sub conn::face_find { 1455sub conn::face_find {
1245 my ($self, $facenum, $face) = @_; 1456 my ($self, $facenum, $face) = @_;
1246 1457
… …
1248 1459
1249 my $id = $FACEMAP->get ($hash); 1460 my $id = $FACEMAP->get ($hash);
1250 1461
1251 unless ($id) { 1462 unless ($id) {
1252 # create new id for face 1463 # create new id for face
1253 # i love transactions 1464 # I love transactions
1254 for (1..100) { 1465 for (1..100) {
1255 my $txn = $CFClient::DB_ENV->txn_begin; 1466 my $txn = $CFClient::DB_ENV->txn_begin;
1256 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1467 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1257 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1468 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1258 $id++; 1469 $id = ($id || 16) + 1;
1259 if ($FACEMAP->put (id => $id) == 0 1470 if ($FACEMAP->put (id => $id) == 0
1260 && $FACEMAP->put ($hash => $id) == 0) { 1471 && $FACEMAP->put ($hash => $id) == 0) {
1261 $txn->txn_commit; 1472 $txn->txn_commit;
1262 1473
1263 goto gotid; 1474 goto gotid;
… …
1271 1482
1272gotid: 1483gotid:
1273 $face->{id} = $id; 1484 $face->{id} = $id;
1274 $MAP->set_face ($facenum => $id); 1485 $MAP->set_face ($facenum => $id);
1275 $self->{faceid}[$facenum] = $id;#d# 1486 $self->{faceid}[$facenum] = $id;#d#
1487
1276 $TILECACHE->get ($id) 1488 $TILECACHE->get ($id) || do {
1489 my $tex = $self->{noface};
1490 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1491 undef
1492 };
1277} 1493}
1278 1494
1279sub conn::face_update { 1495sub conn::face_update {
1280 my ($self, $facenum, $face) = @_; 1496 my ($self, $facenum, $face) = @_;
1281 1497
… …
1374 ); 1590 );
1375 1591
1376 $entry->focus_in; 1592 $entry->focus_in;
1377 } 1593 }
1378 1594
1379 $dialog->show; 1595 $dialog->show_centered;
1380} 1596}
1381 1597
1382sub conn::drawinfo { 1598sub conn::drawinfo {
1383 my ($self, $color, $text) = @_; 1599 my ($self, $color, $text) = @_;
1384 1600
… …
1438 my ($self) = @_; 1654 my ($self) = @_;
1439 1655
1440 $self->send ("command output-sync $CFG->{output_sync}"); 1656 $self->send ("command output-sync $CFG->{output_sync}");
1441 $self->send ("command output-count $CFG->{output_count}"); 1657 $self->send ("command output-count $CFG->{output_count}");
1442 1658
1659 my $parser = new Pod::POM;
1660 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1661
1662 my %skill_tooltip;
1663
1664 for my $head2 ($pod->head2) {
1665 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1666 }
1667
1443 for my $skill (values %{$self->{skill_info}}) { 1668 for my $skill (values %{$self->{skill_info}}) {
1444 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'"); 1669 $MAPWIDGET->add_command ("ready_skill $skill",
1445 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'"); 1670 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1671 . $skill_tooltip{$skill});
1672 $MAPWIDGET->add_command ("use_skill $skill",
1673 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1674 . $skill_tooltip{$skill});
1446 } 1675 }
1447} 1676}
1448 1677
1449sub conn::eof { 1678sub conn::eof {
1450 $MAPWIDGET->clr_commands; 1679 $MAPWIDGET->clr_commands;
… …
1457 return unless $CONN; 1686 return unless $CONN;
1458 1687
1459 $FLOORBOX->clear; 1688 $FLOORBOX->clear;
1460 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1689 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1461 1690
1462 my $count = 4; 1691 my $count = 7;
1463 for (@{ $CONN->{container}{0} }) { 1692 for (@{ $CONN->{container}{0} }) {
1464 if (--$count) { 1693 if (--$count) {
1465 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_); 1694 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1466 } else { 1695 } else {
1467 $FLOORBOX->add (new CFClient::UI::Label text => "More..."); 1696 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
… …
1569 Event::unloop -1; 1798 Event::unloop -1;
1570 }, 1799 },
1571 CFClient::SDL_VIDEORESIZE => sub { 1800 CFClient::SDL_VIDEORESIZE => sub {
1572 }, 1801 },
1573 CFClient::SDL_VIDEOEXPOSE => sub { 1802 CFClient::SDL_VIDEOEXPOSE => sub {
1574 $WANT_REFRESH++; 1803 CFClient::UI::full_refresh;
1575 }, 1804 },
1576 CFClient::SDL_ACTIVEEVENT => sub { 1805 CFClient::SDL_ACTIVEEVENT => sub {
1577# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1806# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1578 }, 1807 },
1579 CFClient::SDL_KEYDOWN => sub { 1808 CFClient::SDL_KEYDOWN => sub {
… …
1615 sdl_mode => 0, 1844 sdl_mode => 0,
1616 width => 640, 1845 width => 640,
1617 height => 480, 1846 height => 480,
1618 fullscreen => 0, 1847 fullscreen => 0,
1619 fast => 0, 1848 fast => 0,
1620 map_scale => 0.5, 1849 map_scale => 1,
1621 fow_enable => 1, 1850 fow_enable => 1,
1622 fow_intensity => 0.45, 1851 fow_intensity => 0.45,
1623 fow_smooth => 0, 1852 fow_smooth => 0,
1624 gui_fontsize => 1, 1853 gui_fontsize => 1,
1625 log_fontsize => 1, 1854 log_fontsize => 1,
… …
1691 1920
1692Event::loop; 1921Event::loop;
1693 1922
1694END { CFClient::SDL_Quit } 1923END { CFClient::SDL_Quit }
1695 1924
1925=head1 NAME
1926
1696=head1 pclient - Crossfire+ and Crossfire game client 1927pclient - A Crossfire+ and Crossfire game client
1697 1928
1698Pclient is a Crossfire+ and Crossfire game client. 1929=head1 SYNOPSIS
1699 1930
1700=head2 Features 1931Just run it - no commandline arguments are supported.
1701
1702=over 4
1703
1704=item Fullscreen Map
1705
1706PClient can uses a fullscreen map, which greatly enhances how much of the
1707game world you can see.
1708
1709=item Persistent Map Cache (Crossfire+ only)
1710
1711PClient can persistently cache all map data it received from the
1712server. This not only allows it to display an overview map, but also
1713ensures that once-explored areas will be available the next time you want
1714to explore more.
1715
1716=item Hardware acceleration
1717
1718Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
1719acceleration. Most modern graphics cards have difficulties with 2D
1720acceleration, while 3D graphics is accelerated well.
1721
1722=item No arbitrary limits
1723
1724Unlike other Crossfire clients, pclient does not suffer from arbitrary
1725limits (like a fixed amount of face numbers). There are still limits, but
1726they are not arbitrarily low :)
1727
1728=back
1729 1932
1730=head1 USAGE 1933=head1 USAGE
1731 1934
1732=head2 The Map 1935Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used
1733 1936fullscreen and interactively.
1734The map is always displayed in the background, behind all other windows and UI elements.
1735
1736#TODO# middle-click scrolls
1737#
1738# keys:
1739#
1740# a apply
1741# keypad moves, kp_5 applies ranged attack to self
1742
1743Starting to type enters the I<completion mode>. In that mode, you can type
1744abbreviations or commands and have them executed as soon as they match a
1745valid command. This is best explained by a few examples:
1746
1747Typing B<climb> will display a list of commands with I<climb> in their
1748name, such as I<ready_skill climbing> and I<use_skill climbing>.
1749
1750You can abbreviate commands by typing only the first character of every
1751word. For example, typing I<iwor> will likely select I<invoke word of
1752recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1753will likely select I<ready_skill climbing> and I<usl> will give you
1754I<use_skill levitation>.
1755
1756=head2 The map overview
1757
1758#TODO#
1759
1760=head2 The Status area in the lower right corner
1761
1762#TODO#
1763
1764=head2 The I<Statistics>/I>Stats> window
1765
1766#TODO#
1767
1768=head1 FAQ
1769
1770=over 4
1771
1772=item The client is very sluggish and slow, what can I do about this?
1773
1774Most likely, you don't have accelerated OpenGL support. Try to find a
1775newer driver, or a driver from your hardware vendor, that features OpenGL
1776support.
1777
1778If this is not an option, the following Setup options reduce the load and
1779will likely make the client playable with sofwtare rendering (it will
1780still be slow, though):
1781
1782=over 4
1783
1784=item B<Video Mode> should be set as low as possible (e.g. 640x480)
1785
1786=item Enable B<Fast & Ugly> mode
1787
1788=item Disable B<Fog of War>
1789
1790=item Increase B<Map Scale>
1791
1792=back
1793
1794=back
1795 1937
1796=head1 AUTHOR 1938=head1 AUTHOR
1797 1939
1798Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1940Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1799 1941

Diff Legend

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