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.248 by root, Thu May 25 01:26:54 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 }
… …
341 audio_shutdown (); 342 audio_shutdown ();
342 audio_init (); 343 audio_init ();
343 } 344 }
344 ); 345 );
345 346
346 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd"); 347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
347 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
348 text => $CFG->{say_command}, 349 text => $CFG->{say_command},
349 tooltip => "This is the command that will be used if you write a line in the message window entry. " 350 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
350 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 351 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
351 ."But you could also set it to 'tell &lt;playername&gt;' to only chat with that user.", 352 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
352 connect_changed => sub { 353 connect_changed => sub {
353 my ($self, $value) = @_; 354 my ($self, $value) = @_;
354 $CFG->{say_command} = $value; 355 $CFG->{say_command} = $value;
355 } 356 }
356 ); 357 );
… …
366 367
367sub set_gauge_window_fontsize { 368sub set_gauge_window_fontsize {
368 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 369 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
369 $_->set_fontsize ($::CFG->{gauge_fontsize}); 370 $_->set_fontsize ($::CFG->{gauge_fontsize});
370 } 371 }
371
372# local $GAUGES->{win}{parent};#d#
373# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
374} 372}
375 373
376sub make_gauge_window { 374sub make_gauge_window {
377 my $gh = int $HEIGHT * $CFG->{gauge_size}; 375 my $gh = int $HEIGHT * $CFG->{gauge_size};
378 376
… …
400 (my $hb = new CFClient::UI::HBox), 398 (my $hb = new CFClient::UI::HBox),
401 ], 399 ],
402 ); 400 );
403 401
404 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 402 $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."); 403 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', 404 $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."); 405 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', 406 $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."); 407 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', 408 $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."); 409 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 410
413 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 411 $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."); 412 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, 413 $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.)"); 414 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
417 415
418 $GAUGES = { 416 $GAUGES = {
419 exp => $exp, win => $win, range => $rng, 417 exp => $exp, win => $win, range => $rng,
420 food => $fg, mana => $mg, hp => $hg, grace => $gg 418 food => $fg, mana => $mg, hp => $hg, grace => $gg
421 }; 419 };
… …
424 422
425 $win 423 $win
426} 424}
427 425
428sub make_stats_window { 426sub make_stats_window {
429 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 427 my $tgw = new CFClient::UI::FancyFrame title => "Stats";
430 428
431 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 429 $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); 430 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
431 can_hover => 1, can_events => 1,
432 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); 433 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
434 can_hover => 1, can_events => 1,
435 tooltip => "The map you are currently on (if supported by the server).");
434 436
435 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 437 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
436
437 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 438 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
438 439
439 my $black = [0, 0, 0]; 440 my $color2 = [1, 1, 0];
440 441
441 for ( 442 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"], 443 [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"], 444 [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"], 445 [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"], 446 [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"], 447 [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"], 448 [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."], 449 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
449 450
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."], 451 [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."], 452 [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."], 453 [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."], 454 [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."], 455 [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."], 456 [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 ) { 457 ) {
457 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 458 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
458 459
459 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 460 $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); 461 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 462 $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); 463 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
463 } 464 }
464 465
465 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 466 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
466 467
467 my $row = 0; 468 my $row = 0;
468 my $col = 0; 469 my $col = 0;
469 470
470 my %resist_names = ( 471 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.)", 472 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.)", 473 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.)", 474 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, ...)", 475 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)", 476 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)", 477 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)", 478 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)", 479 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
479 pois => "Poison (resistance to getting poisoned)", 480 pois => "<b>Poison</b> (resistance to getting poisoned)",
480 para => "Paralysation (this resistance affects the chance you get paralysed)", 481 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
481 deat => "Death (resistance against death spells)", 482 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)", 483 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)", 484 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)", 485 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", 486 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, ...)", 487 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, ...)", 488 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)", 489 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
489 ); 490 );
490 for (qw/slow holyw conf fire depl magic 491 for (qw/slow holyw conf fire depl magic
491 drain acid pois para deat phys 492 drain acid pois para deat phys
492 blind fear tund elec cold ghit/) 493 blind fear tund elec cold ghit/)
493 { 494 {
… …
740 ); 741 );
741 742
742 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 743 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
743 $table->add (1, 7, new CFClient::UI::Slider 744 $table->add (1, 7, new CFClient::UI::Slider
744 req_w => 100, 745 req_w => 100,
745 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1], 746 range => [$CFG->{mapsize}, 10, 100, 0, 1],
746 tooltip => "This is the size of the portion of the map update the server sends you. " 747 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.", 748 . "If you set this to a high value you will be able to see further for example.",
748 connect_changed => sub { 749 connect_changed => sub {
749 my ($self, $value) = @_; 750 my ($self, $value) = @_;
750 751
751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 752 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
752 }, 753 },
… …
781 782
782sub message_window { 783sub message_window {
783 my $window = new CFClient::UI::FancyFrame 784 my $window = new CFClient::UI::FancyFrame
784 title => "Messages", 785 title => "Messages",
785 border_bg => [1, 1, 1, 1], 786 border_bg => [1, 1, 1, 1],
786 bg => [0, 0, 0, 0.5], 787 bg => [0, 0, 0, 0.75],
787 user_w => int $::WIDTH / 3, 788 user_w => int $::WIDTH / 3,
788 user_h => int $::HEIGHT / 5, 789 user_h => int $::HEIGHT / 5,
789 child => (my $vbox = new CFClient::UI::VBox); 790 child => (my $vbox = new CFClient::UI::VBox);
790 791
791 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 792 $vbox->add ($LOGVIEW);
792 expand => 1,
793 font => $FONT_FIXED,
794 fontsize => $::CFG->{log_fontsize},
795 );
796 793
797 $vbox->add (my $input = new CFClient::UI::Entry 794 $vbox->add (my $input = new CFClient::UI::Entry
795 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
796 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
797 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
798 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
798 connect_focus_in => sub { 799 connect_focus_in => sub {
799 my ($input, $prev_focus) = @_; 800 my ($input, $prev_focus) = @_;
800 801
801 delete $input->{refocus_map}; 802 delete $input->{refocus_map};
802 803
… …
831 }; 832 };
832 833
833 $window 834 $window
834} 835}
835 836
837sub open_quit_dialog {
838 unless ($QUIT_DIALOG) {
839
840 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
841
842 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
843
844 $vb->add (new CFClient::UI::Label
845 text => "You should find a savebed and apply it first!",
846 max_w => $WIDTH * 0.25,
847 ellipsize => 0,
848 );
849 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
850 $hb->add (new CFClient::UI::Button
851 text => "Ok",
852 expand => 1,
853 connect_activate => sub { $QUIT_DIALOG->hide },
854 );
855 $hb->add (new CFClient::UI::Button
856 text => "Quit anyway",
857 expand => 1,
858 connect_activate => sub { exit },
859 );
860
861 $QUIT_DIALOG->show_centered;
862 } else {
863 $QUIT_DIALOG->show_centered;
864 }
865}
866
836sub make_inventory_window { 867sub make_inventory_window {
837 my $invwin = new CFClient::UI::FancyFrame 868 my $invwin = new CFClient::UI::FancyFrame
838 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory"; 869 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
839 870
840 $invwin->add (my $hb = new CFClient::UI::HBox); 871 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
841 872
842 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 873 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
843 $vb1->add (my $lbl = new CFClient::UI::Label); 874 $vb1->add (my $lbl = new CFClient::UI::Label);
844 $lbl->set_text ("Player"); 875 $lbl->set_text ("Player");
845 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 876 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
… …
850 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 881 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
851 882
852 $invwin 883 $invwin
853} 884}
854 885
886sub make_help_window {
887 my $win = new CFClient::UI::FancyFrame
888 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
889
890 $win->add (my $vbox = new CFClient::UI::VBox);
891
892 $vbox->add (my $buttons = new CFClient::UI::HBox);
893 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
894
895 for (
896 [intro => "Introduction"],
897 [manual => "Manual"],
898 [command_help => "Commands"],
899 [skill_help => "Skills"],
900 ) {
901 my ($pod, $label) = @$_;
902
903 $buttons->add (new CFClient::UI::Button
904 text => $label,
905 connect_activate => sub {
906 my $parser = new Pod::POM;
907 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
908
909 $viewer->clear;
910
911 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
912 for @{ CFClient::pod_to_pango_list $pom };
913
914 $viewer->set_offset (0);
915 },
916 );
917 }
918
919 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
920
921 $win
922}
923
855sub sdl_init { 924sub sdl_init {
856 CFClient::SDL_Init 925 CFClient::SDL_Init
857 and die "SDL::Init failed!\n"; 926 and die "SDL::Init failed!\n";
858} 927}
859 928
860sub video_init { 929sub video_init {
861 sdl_init; 930 sdl_init;
862 931
863 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 932 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
864 933
934 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
935
865 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 936 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
866 $FULLSCREEN = $CFG->{fullscreen}; 937 $FULLSCREEN = $CFG->{fullscreen};
867 $FAST = $CFG->{fast}; 938 $FAST = $CFG->{fast};
868 939
869 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 940 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
870 or die "SDL_SetVideoMode failed!\n"; 941 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
871 942
872 $SDL_ACTIVE = 1; 943 $SDL_ACTIVE = 1;
873 $LAST_REFRESH = time - 0.01; 944 $LAST_REFRESH = time - 0.01;
874 945
875 CFClient::gl_init; 946 CFClient::gl_init;
… …
878 949
879 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 950 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
880 951
881 ############################################################################# 952 #############################################################################
882 953
883 unless ($DEBUG_STATUS) { 954 if ($DEBUG_STATUS) {
955 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
956 } else {
884 # create the widgets 957 # create the widgets
885 958
886 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 959 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
887 $DEBUG_STATUS->show; 960 $DEBUG_STATUS->show;
888 961
… …
896 )->show; 969 )->show;
897 970
898 CFClient::UI::FancyFrame->new ( 971 CFClient::UI::FancyFrame->new (
899 border_bg => [1, 1, 1, 192/255], 972 border_bg => [1, 1, 1, 192/255],
900 bg => [1, 1, 1, 0], 973 bg => [1, 1, 1, 0],
901 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 974 child => ($MAPMAP = new CFClient::MapWidget::MapMap
975 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
976 ),
902 )->show; 977 )->show;
903 978
904 $MAPWIDGET = new CFClient::MapWidget; 979 $MAPWIDGET = new CFClient::MapWidget;
905 $MAPWIDGET->connect (activate_console => sub { 980 $MAPWIDGET->connect (activate_console => sub {
906 my ($mapwidget, $preset) = @_; 981 my ($mapwidget, $preset) = @_;
… …
915 } 990 }
916 }); 991 });
917 $MAPWIDGET->show; 992 $MAPWIDGET->show;
918 $MAPWIDGET->focus_in; 993 $MAPWIDGET->focus_in;
919 994
995 $LOGVIEW = new CFClient::UI::TextView
996 expand => 1,
997 font => $FONT_FIXED,
998 fontsize => $::CFG->{log_fontsize},
999 can_hover => 1,
1000 can_events => 1,
1001 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1002 ;
1003
920 $BUTTONBAR = new CFClient::UI::HBox; 1004 $BUTTONBAR = new CFClient::UI::HBox;
921 1005
922 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 1006 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1007 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); 1008 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1009 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); 1010 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1011 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
925 1012
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 1013 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 1014
928 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 1015 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1016 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); 1017 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1018 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
930 1019
931 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 1020 $BUTTONBAR->add (new CFClient::UI::Button
1021 text => "Save Config",
1022 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1023 connect_activate => sub {
932 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1024 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
933 status "Configuration Saved"; 1025 status "Configuration Saved";
1026 },
934 }); 1027 );
1028
1029 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1030 tooltip => "View Documentation");
1031
1032 $BUTTONBAR->add (new CFClient::UI::Button
1033 text => "Quit",
1034 tooltip => "Terminates the program",
1035 connect_activate => sub {
1036 if ($CONN) {
1037 open_quit_dialog;
1038 } else {
1039 exit;
1040 }
1041 },
1042 );
935 1043
936 $BUTTONBAR->show; 1044 $BUTTONBAR->show;
937 1045
938 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1046 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
939 1047
… …
972 1080
973sub audio_init { 1081sub audio_init {
974 if ($CFG->{audio_enable}) { 1082 if ($CFG->{audio_enable}) {
975 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1083 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
976 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1084 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1085
1086 unless ($SDL_MIXER) {
1087 status "Unable to open sound device: there will be no sound";
1088 return;
1089 }
1090
977 CFClient::Mix_AllocateChannels 8; 1091 CFClient::Mix_AllocateChannels 8;
978 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1092 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
979 1093
980 audio_music_finished; 1094 audio_music_finished;
981 1095
… …
1009my %animate_object; 1123my %animate_object;
1010my $animate_timer; 1124my $animate_timer;
1011 1125
1012my $fps = 9; 1126my $fps = 9;
1013 1127
1128my %demo;#d#
1129
1014sub force_refresh { 1130sub force_refresh {
1015 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1131 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1016 debug sprintf "%3.2f", $fps; 1132 debug sprintf "%3.2f", $fps;
1017 1133
1018 $CFClient::UI::ROOT->draw; 1134 $CFClient::UI::ROOT->draw;
1019 CFClient::SDL_GL_SwapBuffers;
1020 1135
1021 $WANT_REFRESH = 0; 1136 $WANT_REFRESH = 0;
1022 $CAN_REFRESH = 0; 1137 $CAN_REFRESH = 0;
1023 $LAST_REFRESH = $NOW; 1138 $LAST_REFRESH = $NOW;
1139
11400 && do {
1141 # some weird model-drawing code, just a joke right now
1142 use CFClient::OpenGL;
1143
1144 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1145 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1146 $demo{r} ||= do {
1147 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1148 $mod->{v} = pack "f*", @{$mod->{v}};
1149 $_ = [scalar @$_, pack "S!*", @$_]
1150 for values %{$mod->{g}};
1151 $mod
1152 };
1153
1154 my $r = $demo{r} or die;
1155
1156 glDepthMask 1;
1157 glClear GL_DEPTH_BUFFER_BIT;
1158 glEnable GL_TEXTURE_2D;
1159 glEnable GL_DEPTH_TEST;
1160 glEnable GL_CULL_FACE;
1161 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1162
1163 glMatrixMode GL_PROJECTION;
1164 glLoadIdentity;
1165 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1166 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1167 glMatrixMode GL_MODELVIEW;
1168 glLoadIdentity;
1169
1170 glPushMatrix;
1171 glTranslate 0, 0, -800;
1172 glScale 1, -1, 1;
1173 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1174 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1175 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1176 glScale 50, 50, 50;
1177
1178 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1179 while (my ($k, $v) = each %{$r->{g}}) {
1180 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1181 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1182 }
1183
1184 glPopMatrix;
1185
1186 glShadeModel GL_FLAT;
1187 glDisable GL_DEPTH_TEST;
1188 glDisable GL_TEXTURE_2D;
1189 glDepthMask 0;
1190
1191 $WANT_REFRESH++;
1192};
1193
1194 CFClient::SDL_GL_SwapBuffers;
1024} 1195}
1025 1196
1026my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1197my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
1027 $NOW = time; 1198 $NOW = time;
1028 1199
… …
1077 $arg = $arg eq ".*" ? "" : " $arg"; 1248 $arg = $arg eq ".*" ? "" : " $arg";
1078 1249
1079 $MAPWIDGET->add_command ("$cmd$arg", $text); 1250 $MAPWIDGET->add_command ("$cmd$arg", $text);
1080 } 1251 }
1081 } 1252 }
1253
1254 $self->{noface} = new_from_file CFClient::Texture
1255 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1082 1256
1083 $self 1257 $self
1084} 1258}
1085 1259
1086sub conn::stats_update { 1260sub conn::stats_update {
… …
1154 $self->set_texture ($id => $data); 1328 $self->set_texture ($id => $data);
1155 } 1329 }
1156 } 1330 }
1157} 1331}
1158 1332
1333# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1334# (server resource,s latency, bandwidth), so this hack is warranted.
1335# the right fix is to make real tiled maps with an overview file
1336sub conn::send_mapinfo {
1337 my ($self, $data, $cb) = @_;
1338
1339 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1340 my ($wx, $wy) = ($1, $2);
1341
1342 if ($data =~ /^spatial ([1-4]+)$/) {
1343 my @dx = (0, 0, 1, 0, -1);
1344 my @dy = (0, -1, 0, 1, 0);
1345 my ($dx, $dy);
1346
1347 for (split //, $1) {
1348 $dx += $dx[$_];
1349 $dy += $dy[$_];
1350 }
1351
1352 $cb->(spatial => 15,
1353 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1354 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1355 50, 50,
1356 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1357 );
1358
1359 return;
1360 }
1361 }
1362
1363 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1364}
1365
1159# this method does a "flood fill" into every tile direction 1366# this method does a "flood fill" into every tile direction
1160# it assumes that tiles are arranged in a rectangular grid, 1367# 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. 1368# 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 1369# failure to comply are harmless and result in display errors
1163# at worst. 1370# at worst.
1164sub conn::flood_fill { 1371sub conn::flood_fill {
1165 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1372 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1166 1373
1167 # the server does not allow map paths > 6 1374 # the server does not allow map paths > 6
1168 return if 7 <= length $path; 1375 return if 7 <= length $path;
1169 1376
1170 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1377 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1171 1378
1172 for ( 1379 for (
1173 [1, 0, -1], 1380 [1, 3, 0, -1],
1174 [2, 1, 0], 1381 [2, 4, 1, 0],
1175 [3, 0, 1], 1382 [3, 1, 0, 1],
1176 [4, -1, 0], 1383 [4, 2, -1, 0],
1177 ) { 1384 ) {
1178 my ($tile, $dx, $dy) = @$_; 1385 my ($tile, $tile2, $dx, $dy) = @$_;
1386
1387 next if $block & (1 << $tile);
1388 my $block = $block | (1 << $tile2);
1179 1389
1180 my $gx = $gx + $dx; 1390 my $gx = $gx + $dx;
1181 my $gy = $gy + $dy; 1391 my $gy = $gy + $dy;
1182 1392
1183 next unless $flags & (1 << ($tile - 1)); 1393 next unless $flags & (1 << ($tile - 1));
… …
1185 1395
1186 my $neigh = $self->{neigh_map}{$hash} ||= []; 1396 my $neigh = $self->{neigh_map}{$hash} ||= [];
1187 if (my $info = $neigh->[$tile]) { 1397 if (my $info = $neigh->[$tile]) {
1188 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1398 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1189 1399
1190 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1400 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1191 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1401 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1192 1402
1193 } else { 1403 } else {
1194 $self->send_mapinfo ("spatial $path$tile", sub { 1404 $self->send_mapinfo ("spatial $path$tile", sub {
1195 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1405 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1196 1406
1197 return if $mode ne "spatial"; 1407 return if $mode ne "spatial";
1198 1408
1199 $x += $MAP->ox; 1409 $x += $MAP->ox;
1200 $y += $MAP->oy; 1410 $y += $MAP->oy;
1201 1411
1202 $self->load_map ($hash, $x, $y) 1412 $self->load_map ($hash, $x, $y)
1203 unless $self->{neigh_map}{$hash}[5]++;#d# 1413 unless $self->{neigh_map}{$hash}[5]++;#d#
1204 1414
1205 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1415 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1206 1416
1207 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1417 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1208 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1418 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1209 }); 1419 });
1210 } 1420 }
1211 } 1421 }
1212} 1422}
… …
1225 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1435 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1226 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1436 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1227 ]; 1437 ];
1228 1438
1229 delete $self->{neigh_grid}; 1439 delete $self->{neigh_grid};
1230 $self->flood_fill (0, 0, "", $hash, $flags);
1231 1440
1232 $x += $ox; 1441 $x += $ox;
1233 $y += $oy; 1442 $y += $oy;
1234 1443
1235 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1444 $self->{map_info} = [$hash, $x, $y, $w, $h];
1236 1445
1237 my $map = $self->{map_info}[0];
1238 $map =~ s/^.*?\/([^\/]+)$/\1/; 1446 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1239 $STATWIDS->{map}->set_text ("Map: " . $map); 1447 $STATWIDS->{map}->set_text ("Map: " . $map);
1240 1448
1241 $self->load_map ($hash, $x, $y); 1449 $self->load_map ($hash, $x, $y);
1450 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1242} 1451}
1243 1452
1244sub conn::face_find { 1453sub conn::face_find {
1245 my ($self, $facenum, $face) = @_; 1454 my ($self, $facenum, $face) = @_;
1246 1455
… …
1248 1457
1249 my $id = $FACEMAP->get ($hash); 1458 my $id = $FACEMAP->get ($hash);
1250 1459
1251 unless ($id) { 1460 unless ($id) {
1252 # create new id for face 1461 # create new id for face
1253 # i love transactions 1462 # I love transactions
1254 for (1..100) { 1463 for (1..100) {
1255 my $txn = $CFClient::DB_ENV->txn_begin; 1464 my $txn = $CFClient::DB_ENV->txn_begin;
1256 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1465 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1257 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1466 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1258 $id++; 1467 $id = ($id || 16) + 1;
1259 if ($FACEMAP->put (id => $id) == 0 1468 if ($FACEMAP->put (id => $id) == 0
1260 && $FACEMAP->put ($hash => $id) == 0) { 1469 && $FACEMAP->put ($hash => $id) == 0) {
1261 $txn->txn_commit; 1470 $txn->txn_commit;
1262 1471
1263 goto gotid; 1472 goto gotid;
… …
1271 1480
1272gotid: 1481gotid:
1273 $face->{id} = $id; 1482 $face->{id} = $id;
1274 $MAP->set_face ($facenum => $id); 1483 $MAP->set_face ($facenum => $id);
1275 $self->{faceid}[$facenum] = $id;#d# 1484 $self->{faceid}[$facenum] = $id;#d#
1485
1276 $TILECACHE->get ($id) 1486 $TILECACHE->get ($id) || do {
1487 my $tex = $self->{noface};
1488 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1489 undef
1490 };
1277} 1491}
1278 1492
1279sub conn::face_update { 1493sub conn::face_update {
1280 my ($self, $facenum, $face) = @_; 1494 my ($self, $facenum, $face) = @_;
1281 1495
… …
1374 ); 1588 );
1375 1589
1376 $entry->focus_in; 1590 $entry->focus_in;
1377 } 1591 }
1378 1592
1379 $dialog->show; 1593 $dialog->show_centered;
1380} 1594}
1381 1595
1382sub conn::drawinfo { 1596sub conn::drawinfo {
1383 my ($self, $color, $text) = @_; 1597 my ($self, $color, $text) = @_;
1384 1598
… …
1438 my ($self) = @_; 1652 my ($self) = @_;
1439 1653
1440 $self->send ("command output-sync $CFG->{output_sync}"); 1654 $self->send ("command output-sync $CFG->{output_sync}");
1441 $self->send ("command output-count $CFG->{output_count}"); 1655 $self->send ("command output-count $CFG->{output_count}");
1442 1656
1657 my $parser = new Pod::POM;
1658 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1659
1660 my %skill_tooltip;
1661
1662 for my $head2 ($pod->head2) {
1663 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1664 }
1665
1443 for my $skill (values %{$self->{skill_info}}) { 1666 for my $skill (values %{$self->{skill_info}}) {
1444 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'"); 1667 $MAPWIDGET->add_command ("ready_skill $skill",
1445 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'"); 1668 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1669 . $skill_tooltip{$skill});
1670 $MAPWIDGET->add_command ("use_skill $skill",
1671 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1672 . $skill_tooltip{$skill});
1446 } 1673 }
1447} 1674}
1448 1675
1449sub conn::eof { 1676sub conn::eof {
1450 $MAPWIDGET->clr_commands; 1677 $MAPWIDGET->clr_commands;
… …
1457 return unless $CONN; 1684 return unless $CONN;
1458 1685
1459 $FLOORBOX->clear; 1686 $FLOORBOX->clear;
1460 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1687 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1461 1688
1462 my $count = 4; 1689 my $count = 7;
1463 for (@{ $CONN->{container}{0} }) { 1690 for (@{ $CONN->{container}{0} }) {
1464 if (--$count) { 1691 if (--$count) {
1465 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_); 1692 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1466 } else { 1693 } else {
1467 $FLOORBOX->add (new CFClient::UI::Label text => "More..."); 1694 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
… …
1569 Event::unloop -1; 1796 Event::unloop -1;
1570 }, 1797 },
1571 CFClient::SDL_VIDEORESIZE => sub { 1798 CFClient::SDL_VIDEORESIZE => sub {
1572 }, 1799 },
1573 CFClient::SDL_VIDEOEXPOSE => sub { 1800 CFClient::SDL_VIDEOEXPOSE => sub {
1574 $WANT_REFRESH++; 1801 CFClient::UI::full_refresh;
1575 }, 1802 },
1576 CFClient::SDL_ACTIVEEVENT => sub { 1803 CFClient::SDL_ACTIVEEVENT => sub {
1577# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1804# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1578 }, 1805 },
1579 CFClient::SDL_KEYDOWN => sub { 1806 CFClient::SDL_KEYDOWN => sub {
… …
1615 sdl_mode => 0, 1842 sdl_mode => 0,
1616 width => 640, 1843 width => 640,
1617 height => 480, 1844 height => 480,
1618 fullscreen => 0, 1845 fullscreen => 0,
1619 fast => 0, 1846 fast => 0,
1620 map_scale => 0.5, 1847 map_scale => 1,
1621 fow_enable => 1, 1848 fow_enable => 1,
1622 fow_intensity => 0.45, 1849 fow_intensity => 0.45,
1623 fow_smooth => 0, 1850 fow_smooth => 0,
1624 gui_fontsize => 1, 1851 gui_fontsize => 1,
1625 log_fontsize => 1, 1852 log_fontsize => 1,
… …
1691 1918
1692Event::loop; 1919Event::loop;
1693 1920
1694END { CFClient::SDL_Quit } 1921END { CFClient::SDL_Quit }
1695 1922
1923=head1 NAME
1924
1696=head1 pclient - Crossfire+ and Crossfire game client 1925pclient - A Crossfire+ and Crossfire game client
1697 1926
1698Pclient is a Crossfire+ and Crossfire game client. 1927=head1 SYNOPSIS
1699 1928
1700=head2 Features 1929Just 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 1930
1730=head1 USAGE 1931=head1 USAGE
1731 1932
1732=head2 The Map 1933Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used
1733 1934fullscreen 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 1935
1796=head1 AUTHOR 1936=head1 AUTHOR
1797 1937
1798Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1938Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1799 1939

Diff Legend

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