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.164 by root, Sun Apr 23 01:05:04 2006 UTC vs.
Revision 1.199 by root, Mon May 8 15:12:39 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5
6BEGIN {
7 if (%PAR::LibCache) {
8 @INC = grep ref, @INC; # weed out all paths except pars loader refs
9
10 while (my ($filename, $zip) = each %PAR::LibCache) {
11 for ($zip->memberNames) {
12 next unless /^\/root\/(.*)/;
13 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
14 unless -e "$ENV{PAR_TEMP}/$1";
15 }
16 }
17
18 unshift @INC, $ENV{PAR_TEMP};
19
20 if ($^O eq "MSWin32") {
21 $ENV{GTK_RC_FILES} = "$ENV{PAR_TEMP}/share/themes/MS-Windows/gtk-2.0/gtkrc";
22 }
23 }
24}
25
26# need to do it again because that pile of garbage called PAR nukes it before main
27unshift @INC, $ENV{PAR_TEMP};
5 28
6use Time::HiRes 'time'; 29use Time::HiRes 'time';
7use Event; 30use Event;
8 31
9use Crossfire; 32use Crossfire;
12use Compress::LZF; 35use Compress::LZF;
13 36
14use CFClient; 37use CFClient;
15use CFClient::UI; 38use CFClient::UI;
16use CFClient::MapWidget; 39use CFClient::MapWidget;
40
41$Event::DIED = sub {
42 CFClient::error $_[1];
43};
44
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
17 46
18our $VERSION = '0.1'; 47our $VERSION = '0.1';
19 48
20my $MAX_FPS = 60; 49my $MAX_FPS = 60;
21my $MIN_FPS = 5; # unused as of yet 50my $MIN_FPS = 5; # unused as of yet
37our $WIDTH; 66our $WIDTH;
38our $HEIGHT; 67our $HEIGHT;
39our $FULLSCREEN; 68our $FULLSCREEN;
40our $FONTSIZE; 69our $FONTSIZE;
41 70
71our $FONT_PROP;
72our $FONT_FIXED;
73
42our $MAP; 74our $MAP;
75our $MAPMAP;
43our $MAPWIDGET; 76our $MAPWIDGET;
44our $BUTTONBAR; 77our $BUTTONBAR;
45our $LOGVIEW; 78our $LOGVIEW;
46our $CONSOLE; 79our $CONSOLE;
47our $METASERVER; 80our $METASERVER;
81our $LOGIN_BUTTON;
48 82
83our $FLOORBOX;
49our $GAUGES; 84our $GAUGES;
50our $STATWIDS; 85our $STATWIDS;
51 86
52our $SDL_ACTIVE; 87our $SDL_ACTIVE;
53our %SDL_CB; 88our %SDL_CB;
58 93
59our $ALT_ENTER_MESSAGE; 94our $ALT_ENTER_MESSAGE;
60our $STATUS_LINE; 95our $STATUS_LINE;
61our $DEBUG_STATUS; 96our $DEBUG_STATUS;
62 97
98our $INVWIN;
99our $INV;
100
63sub status { 101sub status {
64 $STATUS_LINE->set_text ($_[0]); 102 $STATUS_LINE->set_text ($_[0]);
65 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h}); 103 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
66} 104}
67 105
69 $DEBUG_STATUS->set_text ($_[0]); 107 $DEBUG_STATUS->set_text ($_[0]);
70 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 108 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
71} 109}
72 110
73sub start_game { 111sub start_game {
112 $LOGIN_BUTTON->set_text ("Logout");
113
74 status "logging in..."; 114 status "logging in...";
75 115
76 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 116 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
77 117
78 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 118 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
79 119
80 $MAP = new CFClient::Map $mapsize, $mapsize; 120 $MAP = new CFClient::Map $mapsize, $mapsize;
81 121
82 my ($host, $port) = split /:/, $CFG->{host}; 122 my ($host, $port) = split /:/, $CFG->{host};
83 123
84 $CONN = new conn 124 $CONN = eval {
125 new conn
85 host => $host, 126 host => $host,
86 port => $port || 13327, 127 port => $port || 13327,
87 user => $CFG->{user}, 128 user => $CFG->{user},
88 pass => $CFG->{password}, 129 pass => $CFG->{password},
89 mapw => $mapsize, 130 mapw => $mapsize,
90 maph => $mapsize, 131 maph => $mapsize,
132 ;
91 ; 133 };
92 134
135 if ($CONN) {
93 status "login successful"; 136 status "login successful";
94 137
95 CFClient::lowdelay fileno $CONN->{fh}; 138 CFClient::lowdelay fileno $CONN->{fh};
139 } else {
140 status "unable to connect";
141 stop_game();
142 }
96} 143}
97 144
98sub stop_game { 145sub stop_game {
146 status "connection closed";
147 $LOGIN_BUTTON->set_text ("Login");
99 undef $CONN; 148 undef $CONN;
100} 149}
101 150
102sub client_setup { 151sub client_setup {
103 my $dialog = new CFClient::UI::FancyFrame 152 my $dialog = new CFClient::UI::FancyFrame
120 $mode_slider->emit (changed => $mode_slider->{range}[0]); 169 $mode_slider->emit (changed => $mode_slider->{range}[0]);
121 170
122 my $row = 1; 171 my $row = 1;
123 172
124 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 173 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
125 $table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 174 $table->add (1, $row++, new CFClient::UI::CheckBox
175 state => $CFG->{fullscreen},
176 tooltip => "Bring the client into fullscreen mode",
177 connect_changed => sub {
126 my ($self, $value) = @_; 178 my ($self, $value) = @_;
127 $CFG->{fullscreen} = $value; 179 $CFG->{fullscreen} = $value;
180 }
128 }); 181 );
129 182
130 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 183 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
131 $table->add (1, $row++, new CFClient::UI::CheckBox 184 $table->add (1, $row++, new CFClient::UI::CheckBox
132 state => $CFG->{fast}, 185 state => $CFG->{fast},
133 tooltip => "Lower the visual quality considerably to speed up rendering.", 186 tooltip => "Lower the visual quality considerably to speed up rendering.",
135 my ($self, $value) = @_; 188 my ($self, $value) = @_;
136 $CFG->{fast} = $value; 189 $CFG->{fast} = $value;
137 } 190 }
138 ); 191 );
139 192
193 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
194 $table->add (1, $row++, new CFClient::UI::Slider
195 range => [$CFG->{map_scale}, 0.25, 2, 0.05],
196 tooltip => "Enlarge or shrink the displayed map",
197 connect_changed => sub {
198 my ($self, $value) = @_;
199 $CFG->{map_scale} = 0.05 * int $value / 0.05;
200 }
201 );
202
140 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
141 $table->add (1, $row++, new CFClient::UI::CheckBox 204 $table->add (1, $row++, new CFClient::UI::CheckBox
142 state => $CFG->{fow_enable}, 205 state => $CFG->{fow_enable},
143 tooltip => "Fog-of-War marks areas that cannot be seen by the player", 206 tooltip => "Fog-of-War marks areas that cannot be seen by the player",
144 connect_changed => sub { 207 connect_changed => sub {
211 ); 274 );
212 275
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 276 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
214 $table->add (1, $row++, new CFClient::UI::Slider 277 $table->add (1, $row++, new CFClient::UI::Slider
215 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 278 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
279 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
216 connect_changed => sub { 280 connect_changed => sub {
217 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 281 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
218 &set_gauge_window_fontsize; 282 &set_gauge_window_fontsize;
219 #$GAUGES->{win}->check_size;
220 #$GAUGES->{win}->update;
221 } 283 }
222 ); 284 );
223 285
224 $table->add (1, $row++, new CFClient::UI::Button 286 $table->add (1, $row++, new CFClient::UI::Button
225 expand => 1, align => 0, text => "Apply", 287 expand => 1, align => 0, text => "Apply",
226 tooltip => "Apply the video settings (unless they are auto-apply)", 288 tooltip => "Apply the video settings",
227 connect_activate => sub { 289 connect_activate => sub {
228 video_shutdown (); 290 video_shutdown ();
229 video_init (); 291 video_init ();
230 } 292 }
231 ); 293 );
260 } 322 }
261 ); 323 );
262 324
263 $table->add (1, $row++, new CFClient::UI::Button 325 $table->add (1, $row++, new CFClient::UI::Button
264 expand => 1, align => 0, text => "Apply", 326 expand => 1, align => 0, text => "Apply",
265 tooltip => "Apply the audio settings that are not auto-apply", 327 tooltip => "Apply the audio settings",
266 connect_activate => sub { 328 connect_activate => sub {
267 audio_shutdown (); 329 audio_shutdown ();
268 audio_init (); 330 audio_init ();
269 } 331 }
270 ); 332 );
271 333
334 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
335 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
336 text => $CFG->{say_command},
337 tooltip => "This is the command that will be used if you write a line in the message window entry. "
338 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
339 ."But you could also set it to 'tell <playername>' to only chat with that user.",
340 connect_changed => sub {
341 my ($self, $value) = @_;
342 $CFG->{say_command} = $value;
343 }
344 );
345
272 $dialog 346 $dialog
273} 347}
274 348
275sub set_stats_window_fontsize { 349sub set_stats_window_fontsize {
276 for (values %{$STATWIDS}) { 350 for (values %{$STATWIDS}) {
280 354
281sub set_gauge_window_fontsize { 355sub set_gauge_window_fontsize {
282 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 356 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
283 $_->set_fontsize ($::CFG->{gauge_fontsize}); 357 $_->set_fontsize ($::CFG->{gauge_fontsize});
284 } 358 }
359
360# local $GAUGES->{win}{parent};#d#
361# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
285} 362}
286 363
287sub make_gauge_window { 364sub make_gauge_window {
288 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 365 my $gh = int ($HEIGHT * $CFG->{gauge_size});
289# my $gw = int ($WIDTH * $CFG->{gauge_w_size}); 366# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
290 367
291 my $win = new CFClient::UI::Frame ( 368 my $win = new CFClient::UI::Frame (
292 y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh 369 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
293 ); 370 );
294 $win->add (my $vb = new CFClient::UI::VBox); 371 $win->add (my $hbox = new CFClient::UI::HBox
295 372 children => [
296 $vb->add (my $hbg = new CFClient::UI::HBox expand => 1); 373 (new CFClient::UI::HBox expand => 1),
374 ($FLOORBOX = new CFClient::UI::VBox),
375 (my $vbox = new CFClient::UI::VBox),
376 ],
377 );
297 378
298 379 $vbox->add (new CFClient::UI::HBox
380 expand => 1,
381 children => [
299 $hbg->add (new CFClient::UI::Empty expand => 1); 382 (new CFClient::UI::Empty expand => 1),
300 $hbg->add (my $hb = new CFClient::UI::HBox); 383 (my $hb = new CFClient::UI::HBox),
384 ],
385 );
386
301 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp'); 387 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
388 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.");
302 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana'); 389 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
390 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.");
303 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace'); 391 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
392 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.");
304 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food'); 393 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
394 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.");
305 395
306 $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP:"); 396 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
307# $vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => 1, text => "Lvl:"); 397 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.");
308 $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:"); 398 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
309 399 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
310 400
311 $GAUGES = { 401 $GAUGES = {
312 exp => $exp,# lvl => $lvl,
313 win => $win, range => $rng, 402 exp => $exp, win => $win, range => $rng,
314 food => $fg, mana => $mg, hp => $hg, grace => $gg 403 food => $fg, mana => $mg, hp => $hg, grace => $gg
315 }; 404 };
405
406 &set_gauge_window_fontsize;
407
316 $win 408 $win
317} 409}
318 410
319sub make_stats_window { 411sub make_stats_window {
320 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats"); 412 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
321 413
322 $tgw->add (my $vb = new CFClient::UI::VBox); 414 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
323 $vb->add (my $uhb = new CFClient::UI::HBox);
324 $uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 415 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
325 $uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 416 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
326 417
327 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 418 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
328 419
329 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 420 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
330 421
331 $tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str"); 422 my $black = [0, 0, 0];
332 $tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");
333 $tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");
334 $tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");
335 $tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");
336 $tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");
337 $tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");
338 423
339 $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 424 for (
340 $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 425 [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
341 $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 426 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"],
342 $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 427 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"],
343 $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 428 [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"],
344 $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 429 [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
345 $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 430 [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"],
431 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."],
346 432
347 $tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc"); 433 [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."],
348 $tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac"); 434 [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."],
349 $tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam"); 435 [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."],
350 $tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm"); 436 [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."],
351 $tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp"); 437 [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."],
352 $tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp"); 438 [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."],
439 ) {
440 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
353 441
354 $tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 442 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
355 $tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 443 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
356 $tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 444 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
357 $tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 445 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip);
358 $tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => ""); 446 }
359 $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
360 447
361 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 448 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
362 449
363 my $row = 0; 450 my $row = 0;
364 my $col = 0; 451 my $col = 0;
365 452
453 my %resist_names = (
454 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.)",
455 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
456 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
457 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
458 depl => "Depletion (some monsters and other effects can cause stats depletion)",
459 magic => "Magic (resistance to magic spells like magic missile or similar)",
460 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
461 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
462 pois => "Poison (resistance to getting poisoned)",
463 para => "Paralysation (this resistance affects the chance you get paralysed)",
464 deat => "Death (resistance against death spells)",
465 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
466 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
467 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)",
468 tund => "Turn undead",
469 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
470 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
471 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
472 );
366 for (qw/slow holyw conf fire depl magic 473 for (qw/slow holyw conf fire depl magic
367 drain acid pois para deat phys 474 drain acid pois para deat phys
368 blind fear tund elec cold ghit/) 475 blind fear tund elec cold ghit/)
369 { 476 {
370 $tbl2->add ($col, $row, 477 $tbl2->add ($col, $row,
371 $STATWIDS->{"res_$_"} = 478 $STATWIDS->{"res_$_"} =
372 new CFClient::UI::Label text => "0", align => +1, valign => 0 479 new CFClient::UI::Label
480 font => $FONT_FIXED,
481 template => "-100%",
482 align => +1,
483 valign => 0,
484 can_events => 1,
485 can_hover => 1,
486 tooltip => $resist_names{$_},
373 ); 487 );
374 $tbl2->add ($col + 1, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png"); 488 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
489 font => $FONT_FIXED,
490 can_hover => 1,
491 can_events => 1,
492 image => "ui/resist/resist_$_.png",
493 tooltip => $resist_names{$_},
494 );
375 495
376 $row++; 496 $row++;
377 if ($row % 6 == 0) { 497 if ($row % 6 == 0) {
378 $col += 2; 498 $col += 2;
379 $row = 0; 499 $row = 0;
384 update_stats_window ({}); 504 update_stats_window ({});
385 505
386 $tgw 506 $tgw
387} 507}
388 508
509sub formsep {
510 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
511}
512
389sub update_stats_window { 513sub update_stats_window {
390 my ($stats) = @_; 514 my ($stats) = @_;
391 515
392 # i love text protocols!!! 516 # i love text protocols!!!
393 my $hp = $stats->{1} * 1; 517 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
394 my $hp_m = $stats->{2} * 1; 518 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
395 my $sp = $stats->{3} * 1; 519 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
396 my $sp_m = $stats->{4} * 1; 520 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
397 my $fo = $stats->{18} * 1; 521 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
398 my $fo_m = 999; 522 my $fo_m = 999;
399 my $gr = $stats->{23} * 1; 523 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
400 my $gr_m = $stats->{24} * 1; 524 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
401 525
402 $GAUGES->{hp} ->set_value ($hp, $hp_m); 526 $GAUGES->{hp} ->set_value ($hp, $hp_m);
403 $GAUGES->{mana} ->set_value ($sp, $sp_m); 527 $GAUGES->{mana} ->set_value ($sp, $sp_m);
404 $GAUGES->{food} ->set_value ($fo, $fo_m); 528 $GAUGES->{food} ->set_value ($fo, $fo_m);
405 $GAUGES->{grace} ->set_value ($gr, $gr_m); 529 $GAUGES->{grace} ->set_value ($gr, $gr_m);
406 $GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} || $stats->{28}) * 1 530 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
407 ." LVL: " . $stats->{12} * 1); 531 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
408 my $rng = $stats->{20}; 532 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
409 $rng =~ s/^Range: //; # thank you so much dear server 533 $rng =~ s/^Range: //; # thank you so much dear server
410 $GAUGES->{range} ->set_text ("Rng: " . $rng); 534 $GAUGES->{range} ->set_text ("Rng: " . $rng);
411# $GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12}); 535 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
536 $title =~ s/^Player: //;
412 $STATWIDS->{title} ->set_text ("Title: " . $stats->{21}); 537 $STATWIDS->{title} ->set_text ("Title: " . $title);
413 538
414 if (0) { # this code can vanish, just wanted to preserver it for a checkin
415 $STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
416 $STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
417 $STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
418 $STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
419 $STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
420 $STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
421 $STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
422 $STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
423 $STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
424 $STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
425 $STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
426 $STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
427 $STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
428 } else {
429 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 539 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
430 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 540 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
431 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 541 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
432 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 542 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
433 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 543 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
434 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 544 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
435 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 545 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
436 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 546 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
437 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 547 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
438 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 548 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
439 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 549 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
440 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17}); 550 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
441 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19}); 551 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
442 }
443 552
444 my %tbl = ( 553 my %tbl = (
445 phys => 100, 554 phys => 100,
446 magic => 101, 555 magic => 101,
447 fire => 102, 556 fire => 102,
454 pois => 109, 563 pois => 109,
455 slow => 110, 564 slow => 110,
456 para => 111, 565 para => 111,
457 tund => 112, 566 tund => 112,
458 fear => 113, 567 fear => 113,
568 depl => 113,
459 deat => 115, 569 deat => 115,
460 holyw => 116, 570 holyw => 116,
461 blind => 117 571 blind => 117
462 ); 572 );
463 573
467 577
468} 578}
469 579
470sub metaserver_dialog { 580sub metaserver_dialog {
471 my $dialog = new CFClient::UI::FancyFrame 581 my $dialog = new CFClient::UI::FancyFrame
472 title => "Metaserver", 582 title => "Server List",
473 child => (my $vbox = new CFClient::UI::VBox); 583 child => (my $vbox = new CFClient::UI::VBox);
474 584
475 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 585 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
476 586
477 $dialog 587 $dialog
478} 588}
589
590my $METASERVER_ATIME;
479 591
480sub update_metaserver { 592sub update_metaserver {
481 my ($HOST) = @_; 593 my ($HOST) = @_;
482 594
483 status "fetching metaserver list..."; 595 return if $METASERVER_ATIME > time;
596 $METASERVER_ATIME = time + 60;
597
598 my $table = $METASERVER->{table};
599 $table->clear;
600 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
484 601
485 my $buf; 602 my $buf;
486 603
487 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 604 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
605
606 unless ($fh) {
607 $label->set_text ("unable to contact metaserver: $!");
608 return;
609 }
488 610
489 Event->io (fd => $fh, poll => 'r', cb => sub { 611 Event->io (fd => $fh, poll => 'r', cb => sub {
490 my $res = sysread $fh, $buf, 8192, length $buf; 612 my $res = sysread $fh, $buf, 8192, length $buf;
491 613
492 if (!defined $res) { 614 if (!defined $res) {
493 $_[0]->w->cancel; 615 $_[0]->w->cancel;
494 status "metaserver: $!"; 616 $label->set_text ("error while retrieving server list: $!");
495 } elsif ($res == 0) { 617 } elsif ($res == 0) {
496 $_[0]->w->cancel; 618 $_[0]->w->cancel;
497 status "server list retrieved"; 619 status "server list retrieved";
498 620
499 my $table = $METASERVER->{table}; 621 utf8::decode $buf if utf8::valid $buf;
500 622
501 $table->clear; 623 $table->clear;
502 624
503 my @col = qw(Use #Users Host Uptime Version Description); 625 my @col = qw(Use #Users Host Uptime Version Description);
504 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 626 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
528 $m = [$users, $host, $uptime, $version, $desc]; 650 $m = [$users, $host, $uptime, $version, $desc];
529 651
530 $y++; 652 $y++;
531 653
532 $table->add (0, $y, new CFClient::UI::VBox children => [ 654 $table->add (0, $y, new CFClient::UI::VBox children => [
533 (new CFClient::UI::Button text => " ", connect_activate => sub { 655 (new CFClient::UI::Button text => "Use", connect_activate => sub {
534 $HOST->set_text ($CFG->{host} = $host); 656 $HOST->set_text ($CFG->{host} = $host);
535 }), 657 }),
536 (new CFClient::UI::Empty expand => 1), 658 (new CFClient::UI::Empty expand => 1),
537 ]); 659 ]);
538 660
552 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 674 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
553 675
554 { 676 {
555 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 677 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
556 678
557 $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub { 679 $vbox->add (
680 my $HOST = new CFClient::UI::Entry
681 expand => 1,
682 text => $CFG->{host},
683 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
684 connect_changed => sub {
685 my ($self, $value) = @_;
686 $CFG->{host} = $value;
687 }
688 );
689
690 $METASERVER = metaserver_dialog;
691
692 $vbox->add (new CFClient::UI::Flopper
693 expand => 1,
694 text => "Metaserver",
695 other => $METASERVER,
696 tooltip => "Show a list of avaible crossfire servers",
697 connect_open => sub {
698 update_metaserver $HOST;
699 }
700 );
701 }
702
703 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
704 $table->add (1, 4, new CFClient::UI::Entry
705 text => $CFG->{user},
706 tooltip => "The name of your character on the server",
707 connect_changed => sub {
558 my ($self, $value) = @_; 708 my ($self, $value) = @_;
559 $CFG->{host} = $value;
560 });
561
562 $METASERVER = metaserver_dialog;
563
564 $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
565 update_metaserver $HOST;
566 });
567 }
568
569 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
570 $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
571 my ($self, $value) = @_;
572 $CFG->{user} = $value; 709 $CFG->{user} = $value;
710 }
573 }); 711 );
574 712
575 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 713 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
576 $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub { 714 $table->add (1, 5, new CFClient::UI::Entry
715 text => $CFG->{password},
716 hidden => 1,
717 tooltip => "The password for your character",
718 connect_changed => sub {
577 my ($self, $value) = @_; 719 my ($self, $value) = @_;
578 $CFG->{password} = $value; 720 $CFG->{password} = $value;
721 }
579 }); 722 );
580
581 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
582 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
583 my ($self, $value) = @_;
584 $CFG->{say_command} = $value;
585 });
586 723
587 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 724 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
588 $table->add (1, 7, new CFClient::UI::Slider 725 $table->add (1, 7, new CFClient::UI::Slider
589 req_w => 100, 726 req_w => 100,
590 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 727 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
728 tooltip => "This is the size of the portion of the map update the server sends you. "
729 ."If you set this to a high value you will be able to see further for example.",
591 connect_changed => sub { 730 connect_changed => sub {
592 my ($self, $value) = @_; 731 my ($self, $value) = @_;
593 732
594 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 733 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
595 }, 734 },
596 ); 735 );
597 736
598 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 737 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
738 expand => 1,
739 align => 0,
740 text => "Login",
741 connect_activate => sub {
742 $CONN ? stop_game
599 start_game; 743 : start_game;
744 },
600 }); 745 );
601 746
602 $dialog 747 $dialog
603} 748}
604 749
605sub message_window { 750sub message_window {
606 my $window = new CFClient::UI::FancyFrame 751 my $window = new CFClient::UI::FancyFrame
607 title => "Messages", 752 title => "Messages",
608 border_bg => [1, 1, 1, 0.5], 753 border_bg => [1, 1, 1, 1],
609 bg => [0.3, 0.3, 0.3, 0.8], 754 bg => [0, 0, 0, 0.5],
610 user_w => int $::WIDTH / 3, 755 user_w => int $::WIDTH / 3,
611 user_h => int $::HEIGHT / 5, 756 user_h => int $::HEIGHT / 5,
612 child => (my $vbox = new CFClient::UI::VBox); 757 child => (my $vbox = new CFClient::UI::VBox);
613 758
614 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 759 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
615 expand => 1, 760 expand => 1,
761 font => $FONT_FIXED,
616 fontsize => $::CFG->{log_fontsize}, 762 fontsize => $::CFG->{log_fontsize},
617 ); 763 );
618 764
619 $vbox->add (my $input = new CFClient::UI::Entry 765 $vbox->add (my $input = new CFClient::UI::Entry
620 connect_focus_in => sub { 766 connect_focus_in => sub {
653 }; 799 };
654 800
655 $window 801 $window
656} 802}
657 803
804sub make_inventory_window {
805 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
806 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1);
807 $invwin
808}
809
658sub sdl_init { 810sub sdl_init {
659 CFClient::SDL_Init 811 CFClient::SDL_Init
660 and die "SDL::Init failed!\n"; 812 and die "SDL::Init failed!\n";
661} 813}
662 814
663sub video_init { 815sub video_init {
664 sdl_init; 816 sdl_init;
817
818 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
665 819
666 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 820 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
667 $FULLSCREEN = $CFG->{fullscreen}; 821 $FULLSCREEN = $CFG->{fullscreen};
668 $FAST = $CFG->{fast}; 822 $FAST = $CFG->{fast};
669 823
693 fontsize => 0.8, 847 fontsize => 0.8,
694 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 848 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
695 $ALT_ENTER_MESSAGE->show; 849 $ALT_ENTER_MESSAGE->show;
696 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h}); 850 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
697 851
698 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 852 CFClient::UI::FancyFrame->new (
699 $MAPWIDGET->focus_in; 853 border_bg => [1, 1, 1, 192/255],
854 bg => [1, 1, 1, 0],
855 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
856 )->show;
857
858 $MAPWIDGET = new CFClient::MapWidget;
700 $MAPWIDGET->connect (activate_console => sub { 859 $MAPWIDGET->connect (activate_console => sub {
701 my ($mapwidget, $preset) = @_; 860 my ($mapwidget, $preset) = @_;
702 861
703 if ($CONSOLE) { 862 if ($CONSOLE) {
704 $CONSOLE->{input}->{auto_activated} = 1; 863 $CONSOLE->{input}->{auto_activated} = 1;
707 if ($preset && $CONSOLE->{input}->get_text eq '') { 866 if ($preset && $CONSOLE->{input}->get_text eq '') {
708 $CONSOLE->{input}->set_text ($preset); 867 $CONSOLE->{input}->set_text ($preset);
709 } 868 }
710 } 869 }
711 }); 870 });
871 $MAPWIDGET->show;
872 $MAPWIDGET->focus_in;
712 873
713 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 874 $BUTTONBAR = new CFClient::UI::HBox;
714 875
715 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 876 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
716 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 877 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
717 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 878 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
879
880 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
881
882 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
883 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
718 884
719 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 885 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
720 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 886 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
721 status "Configuration Saved"; 887 status "Configuration Saved";
722 }); 888 });
723 889
724 $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 890 $BUTTONBAR->show;
725 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
726 891
727 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 892 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
728
729
730} 893}
731 894
732sub video_shutdown { 895sub video_shutdown {
733 $CFClient::UI::ROOT->{children} = []; 896 $CFClient::UI::ROOT->{children} = [];
897 undef $CFClient::UI::GRAB;
898 undef $CFClient::UI::HOVER;
734 undef $SDL_ACTIVE; 899 undef $SDL_ACTIVE;
735} 900}
736 901
737my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 902my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
738my $bgmusic;#TODO#hack#d# 903my $bgmusic;#TODO#hack#d#
904
905sub audio_channel_finished {
906 my ($channel) = @_;
907
908 warn "channel $channel finished\n";#d#
909}
739 910
740sub audio_music_finished { 911sub audio_music_finished {
741 return unless $CFG->{bgm_enable}; 912 return unless $CFG->{bgm_enable};
742 913
743 # TODO: hack, do play loop and mood music 914 # TODO: hack, do play loop and mood music
747 push @bgmusic, shift @bgmusic; 918 push @bgmusic, shift @bgmusic;
748} 919}
749 920
750sub audio_init { 921sub audio_init {
751 if ($CFG->{audio_enable}) { 922 if ($CFG->{audio_enable}) {
752 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 923 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
753 $SDL_MIXER = !CFClient::Mix_OpenAudio; 924 $SDL_MIXER = !CFClient::Mix_OpenAudio;
754 CFClient::Mix_AllocateChannels 8; 925 CFClient::Mix_AllocateChannels 8;
755 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 926 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
756 927
757 audio_music_finished; 928 audio_music_finished;
912# at worst. 1083# at worst.
913sub conn::flood_fill { 1084sub conn::flood_fill {
914 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1085 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
915 1086
916 # the server does not allow map paths > 6 1087 # the server does not allow map paths > 6
917 return if 6 <= length $path; 1088 return if 7 <= length $path;
918 1089
919 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1090 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
920 1091
921 for ( 1092 for (
922 [1, 0, -1], 1093 [1, 0, -1],
965 1136
966 $self->flush_map; 1137 $self->flush_map;
967 1138
968 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1139 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
969 1140
970 my $mapmapw = 250; 1141 my $mapmapw = $MAPMAP->{w};
971 my $mapmaph = 250; 1142 my $mapmaph = $MAPMAP->{h};
972 1143
973 $self->{neigh_rect} = [ 1144 $self->{neigh_rect} = [
974 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1145 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
975 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1146 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
976 ]; 1147 ];
1019 } 1190 }
1020 1191
1021gotid: 1192gotid:
1022 $face->{id} = $id; 1193 $face->{id} = $id;
1023 $MAP->set_face ($facenum => $id); 1194 $MAP->set_face ($facenum => $id);
1195 $self->{faceid}[$facenum] = $id;#d#
1024 $TILECACHE->get ($id) 1196 $TILECACHE->get ($id)
1025} 1197}
1026 1198
1027sub conn::face_update { 1199sub conn::face_update {
1028 my ($self, $facenum, $face) = @_; 1200 my ($self, $facenum, $face) = @_;
1036 my ($self, $id, $data) = @_; 1208 my ($self, $id, $data) = @_;
1037 1209
1038 $self->{texture}[$id] ||= do { 1210 $self->{texture}[$id] ||= do {
1039 my $tex = 1211 my $tex =
1040 new_from_image CFClient::Texture 1212 new_from_image CFClient::Texture
1041 $data, minify => 1; 1213 $data, minify => 1, mipmap => 1;
1042 1214
1043 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 1215 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1044 $MAPWIDGET->update; 1216 $MAPWIDGET->update;
1045 1217
1046 $tex 1218 $tex
1058 1230
1059 $chunk->play; 1231 $chunk->play;
1060# warn "sound $x,$y,$soundnum,$type\n";#d# 1232# warn "sound $x,$y,$soundnum,$type\n";#d#
1061} 1233}
1062 1234
1235my $LAST_QUERY; # server is stupid, stupid, stupid
1236
1063sub conn::query { 1237sub conn::query {
1064 my ($self, $flags, $prompt) = @_; 1238 my ($self, $flags, $prompt) = @_;
1065 1239
1066 #TODO, display dialog with relevant information 1240 $prompt = $LAST_QUERY unless length $prompt;
1067 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 1241 $LAST_QUERY = $prompt;
1242
1243 my $dialog = new CFClient::UI::FancyFrame
1244 title => "Query",
1245 child => my $vbox = new CFClient::UI::VBox;
1246
1247 $vbox->add (new CFClient::UI::Label
1248 max_w => $::WIDTH * 0.4,
1249 text => $prompt);
1250
1251 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1252 $vbox->add (my $hbox = new CFClient::HBox);
1253 $hbox->add (new CFClient::Button
1254 text => "No",
1255 connect_activate => sub {
1256 $self->send ("reply n");
1257 $dialog->destroy;
1258 $MAPWIDGET->focus_in;
1259 }
1260 );
1261 $hbox->add (new CFClient::Button
1262 text => "Yes",
1263 connect_activate => sub {
1264 $self->send ("reply y");
1265 $dialog->destroy;
1266 $MAPWIDGET->focus_in;
1267 },
1268 );
1269
1270 $dialog->focus_in;
1271
1272 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1273 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1274 $vbox->add (my $entry = new CFClient::UI::Entry
1275 connect_changed => sub {
1276 $self->send ("reply $_[1]");
1277 $dialog->destroy;
1278 $MAPWIDGET->focus_in;
1279 },
1280 );
1281
1282 $entry->focus_in;
1283
1284 } else {
1285 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1286
1287 $vbox->add (my $entry = new CFClient::UI::Entry
1288 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1289 connect_activate => sub {
1290 $self->send ("reply $_[1]");
1291 $dialog->destroy;
1292 $MAPWIDGET->focus_in;
1293 },
1294 );
1295
1296 $entry->focus_in;
1297 }
1298
1299 $dialog->show;
1068} 1300}
1069 1301
1070sub conn::drawinfo { 1302sub conn::drawinfo {
1071 my ($self, $color, $text) = @_; 1303 my ($self, $color, $text) = @_;
1072 1304
1090} 1322}
1091 1323
1092sub conn::spell_add { 1324sub conn::spell_add {
1093 my ($self, $spell) = @_; 1325 my ($self, $spell) = @_;
1094 1326
1327 # TODO
1328 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1095 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub { 1329 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message});
1096 });
1097 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub { 1330 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message});
1098 });
1099} 1331}
1100 1332
1101sub conn::spell_delete { 1333sub conn::spell_delete {
1102 my ($self, $spell) = @_; 1334 my ($self, $spell) = @_;
1103} 1335}
1104 1336
1105sub conn::addme_success { 1337sub conn::addme_success {
1106 my ($self) = @_; 1338 my ($self) = @_;
1107 1339
1108 for my $skill (values %{$self->{skill_info}}) { 1340 for my $skill (values %{$self->{skill_info}}) {
1109 $MAPWIDGET->add_command ("ready_skill $skill", "", sub { 1341 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1342 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1343 }
1344}
1345
1346sub update_floorbox {
1347 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1348 $FLOORBOX->clear;
1349 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1350
1351 # we basically have to use the same sorting as everybody else
1352 for my $item (@{ $CONN->{container}{0} }) {
1353 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item);
1110 }); 1354 }
1111 $MAPWIDGET->add_command ("use_skill $skill", "", sub { 1355 });
1356 refresh;
1357}
1358
1359sub conn::container_add {
1360 my ($self, $id, $items) = @_;
1361
1362 update_floorbox if $id == 0;
1363 if ($self->{player}{tag} == $id) {
1364 $INV->set_items ($self->{container}{$self->{player}{tag}});
1365 }
1366 # $self-<{player}{tag} => player inv
1367 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1368}
1369
1370sub conn::container_clear {
1371 my ($self, $id) = @_;
1372
1373 update_floorbox if $id == 0;
1374 if ($self->{player}{tag} == $id) {
1375 $INV->set_items ($self->{container}{$id});
1376 }
1377
1378# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1379}
1380
1381sub conn::item_delete {
1382 my ($self, @items) = @_;
1383
1384 for (@items) {
1385 update_floorbox if $_->{container} == 0;
1386 if ($self->{player}{tag} == $_->{container}) {
1387 $INV->set_items ($self->{container}{$_->{container}});
1112 }); 1388 }
1389 }
1390}
1391
1392sub conn::item_update {
1393 my ($self, $item) = @_;
1394
1395 update_floorbox if $item->{container} == 0;
1396 if ($self->{player}{tag} == $item->{container}) {
1397 $INV->set_items ($self->{container}{$item->{container}});
1113 } 1398 }
1114} 1399}
1115 1400
1116%SDL_CB = ( 1401%SDL_CB = (
1117 CFClient::SDL_QUIT => sub { 1402 CFClient::SDL_QUIT => sub {
1131 video_init; 1416 video_init;
1132 } else { 1417 } else {
1133 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1418 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1134 } 1419 }
1135 }, 1420 },
1136 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1421 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1137 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1422 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1138 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1423 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1139 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1424 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1140 CFClient::SDL_USEREVENT => \&audio_music_finished, 1425 CFClient::SDL_USEREVENT => sub {
1426 if ($_[0]{code} == 1) {
1427 audio_channel_finished $_[0]{data1};
1428 } elsif ($_[0]{code} == 0) {
1429 audio_music_finished;
1430 }
1431 },
1141); 1432);
1142 1433
1143############################################################################# 1434#############################################################################
1144 1435
1145$SIG{INT} = $SIG{TERM} = sub { exit }; 1436$SIG{INT} = $SIG{TERM} = sub { exit };
1437
1438CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1146 1439
1147$TILECACHE = CFClient::db_table "tilecache"; 1440$TILECACHE = CFClient::db_table "tilecache";
1148$FACEMAP = CFClient::db_table "facemap"; 1441$FACEMAP = CFClient::db_table "facemap";
1149
1150CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1151 1442
1152my %DEF_CFG = ( 1443my %DEF_CFG = (
1153 sdl_mode => 0, 1444 sdl_mode => 0,
1154 width => 640, 1445 width => 640,
1155 height => 480, 1446 height => 480,
1156 fullscreen => 0, 1447 fullscreen => 0,
1157 fast => 0, 1448 fast => 0,
1449 map_scale => 0.5,
1158 fow_enable => 1, 1450 fow_enable => 1,
1159 fow_intensity => 0.45, 1451 fow_intensity => 0.45,
1160 fow_smooth => 0, 1452 fow_smooth => 0,
1161 gui_fontsize => 1, 1453 gui_fontsize => 1,
1162 log_fontsize => 1, 1454 log_fontsize => 1,
1184@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 1476@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1185 1477
1186$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 1478$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1187 1479
1188{ 1480{
1189 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 1481 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1482 DejaVuSans.ttf
1483 DejaVuSansMono.ttf
1484 DejaVuSans-Bold.ttf
1485 DejaVuSansMono-Bold.ttf
1486 DejaVuSans-Oblique.ttf
1487 DejaVuSansMono-Oblique.ttf
1488 DejaVuSans-BoldOblique.ttf
1489 DejaVuSansMono-BoldOblique.ttf
1490 );
1190 1491
1191 CFClient::add_font $_ for @fonts; 1492 CFClient::add_font $_ for @fonts;
1192 CFClient::set_font $fonts[0]; 1493
1494 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1495 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1496
1497 $FONT_PROP->make_default;
1193} 1498}
1194 1499
1195video_init; 1500video_init;
1196audio_init; 1501audio_init;
1197 1502
1198Event::loop; 1503Event::loop;
1199 1504
1200END { CFClient::SDL_Quit } 1505END { CFClient::SDL_Quit }
1201 1506
1507=head1 pclient - Crossfire+ and Crossfire game client
1202 1508
1509Pclient is a Crossfire+ and Crossfire game client.
1510
1511=head2 Features
1512
1513=over 4
1514
1515=item Fullscreen Map
1516
1517PClient can uses a fullscreen map, which greatly enhances how much of the
1518game world you can see.
1519
1520=item Persistent Map Cache (Crossfire+ only)
1521
1522PClient can persistently cache all map data it received from the
1523server. This not only allows it to display an overview map, but also
1524ensures that once-explored areas will be available the next time you want
1525to explore more.
1526
1527=item Hardware acceleration
1528
1529Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
1530acceleration. Most modern graphics cards have difficulties with 2D
1531acceleration, while 3D graphics is accelerated well.
1532
1533=item No arbitrary limits
1534
1535Unlike other Crossfire clients, pclient does not suffer from arbitrary
1536limits (like a fixed amount of face numbers). There are still limits, but
1537they are not arbitrarily low :)
1538
1539=back
1540
1541=head1 USAGE
1542
1543=head2 The Map
1544
1545The map is always displayed in the background, behind all other windows and UI elements.
1546
1547#TODO# middle-click scrolls
1548#
1549# keys:
1550#
1551# a apply
1552# keypad moves, kp_5 applies ranged attack to self
1553
1554Starting to type enters the I<completion mode>. In that mode, you can type
1555abbreviations or commands and have them executed as soon as they match a
1556valid command. This is best explained by a few examples:
1557
1558Typing B<climb> will display a list of commands with I<climb> in their
1559name, such as I<ready_skill climbing> and I<use_skill climbing>.
1560
1561You can abbreviate commands by typing only the first character of every
1562word. For example, typing I<iwor> will likely select I<invoke word of
1563recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1564will likely select I<ready_skill climbing> and I<usl> will give you
1565I<use_skill levitation>.
1566
1567=head2 The map overview
1568
1569#TODO#
1570
1571=head2 The Status area in the lower right corner
1572
1573#TODO#
1574
1575=head2 The I<Statistics>/I>Stats> window
1576
1577#TODO#
1578
1579=head1 FAQ
1580
1581=over 4
1582
1583=item The client is very sluggish and slow, what can I do about this?
1584
1585Most likely, you don't have accelerated OpenGL support. Try to find a
1586newer driver, or a driver from your hardware vendor, that features OpenGL
1587support.
1588
1589If this is not an option, the following Setup options reduce the load and
1590will likely make the client playable with sofwtare rendering (it will
1591still be slow, though):
1592
1593=over 4
1594
1595=item B<Video Mode> should be set as low as possible (e.g. 640x480)
1596
1597=item Enable B<Fast & Ugly> mode
1598
1599=item Disable B<Fog of War>
1600
1601=item Increase B<Map Scale>
1602
1603=back
1604
1605=back
1606
1607=head1 AUTHOR
1608
1609Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1610
1611
1612

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines