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.176 by root, Mon Apr 24 10:19:40 2006 UTC vs.
Revision 1.218 by elmex, Mon May 15 21:17:17 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::UI; 38use CFClient::UI;
39use CFClient::MapWidget; 39use CFClient::MapWidget;
40 40
41$SIG{__DIE__} = sub { CFClient::fatal "$_[0]"; exit 1 }; 41$Event::DIED = sub {
42 # TODO: display dialog box or so
43 CFClient::error $_[1];
44};
45
46#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
42 47
43our $VERSION = '0.1'; 48our $VERSION = '0.1';
44 49
45my $MAX_FPS = 60; 50my $MAX_FPS = 60;
46my $MIN_FPS = 5; # unused as of yet 51my $MIN_FPS = 5; # unused as of yet
… …
55our $NOW; 60our $NOW;
56 61
57our $CFG; 62our $CFG;
58our $CONN; 63our $CONN;
59our $FAST; # fast, low-quality mode, possibly useful for software-rendering 64our $FAST; # fast, low-quality mode, possibly useful for software-rendering
65
66our $WANT_REFRESH;
67our $CAN_REFRESH;
60 68
61our @SDL_MODES; 69our @SDL_MODES;
62our $WIDTH; 70our $WIDTH;
63our $HEIGHT; 71our $HEIGHT;
64our $FULLSCREEN; 72our $FULLSCREEN;
… …
66 74
67our $FONT_PROP; 75our $FONT_PROP;
68our $FONT_FIXED; 76our $FONT_FIXED;
69 77
70our $MAP; 78our $MAP;
79our $MAPMAP;
71our $MAPWIDGET; 80our $MAPWIDGET;
72our $BUTTONBAR; 81our $BUTTONBAR;
73our $LOGVIEW; 82our $LOGVIEW;
74our $CONSOLE; 83our $CONSOLE;
75our $METASERVER; 84our $METASERVER;
85our $LOGIN_BUTTON;
76 86
77our $FLOORBOX; 87our $FLOORBOX;
78our $GAUGES; 88our $GAUGES;
79our $STATWIDS; 89our $STATWIDS;
80 90
… …
84our $SDL_MIXER; 94our $SDL_MIXER;
85our @SOUNDS; # event => file mapping 95our @SOUNDS; # event => file mapping
86our %AUDIO_CHUNKS; # audio files 96our %AUDIO_CHUNKS; # audio files
87 97
88our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
89our $STATUS_LINE; 99our $STATUSBOX;
90our $DEBUG_STATUS; 100our $DEBUG_STATUS;
91 101
102our $INVWIN;
103our $INV;
104our $INVR;
105our $OPENCONT;
106
92sub status { 107sub status {
93 $STATUS_LINE->set_text ($_[0]); 108 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
94 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
95} 109}
96 110
97sub debug { 111sub debug {
98 $DEBUG_STATUS->set_text ($_[0]); 112 $DEBUG_STATUS->set_text ($_[0]);
99 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 113 my ($w, $h) = $DEBUG_STATUS->size_request;
114 $DEBUG_STATUS->move ($WIDTH - $w, 0);
100} 115}
101 116
102sub start_game { 117sub start_game {
103 status "logging in..."; 118 status "logging in...";
104 119
105 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 120 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
106 121
107 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 122 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
108
109 $MAP = new CFClient::Map $mapsize, $mapsize; 123 $MAP = new CFClient::Map $mapsize, $mapsize;
110 124
111 my ($host, $port) = split /:/, $CFG->{host}; 125 my ($host, $port) = split /:/, $CFG->{host};
112 126
113 $CONN = new conn 127 $CONN = eval {
128 new conn
114 host => $host, 129 host => $host,
115 port => $port || 13327, 130 port => $port || 13327,
116 user => $CFG->{user}, 131 user => $CFG->{user},
117 pass => $CFG->{password}, 132 pass => $CFG->{password},
118 mapw => $mapsize, 133 mapw => $mapsize,
119 maph => $mapsize, 134 maph => $mapsize,
135 ;
120 ; 136 };
121 137
138 if ($CONN) {
139 $LOGIN_BUTTON->set_text ("Logout");
140
122 status "login successful"; 141 status "login successful";
123 142
124 CFClient::lowdelay fileno $CONN->{fh}; 143 CFClient::lowdelay fileno $CONN->{fh};
144 } else {
145 status "unable to connect";
146 stop_game();
147 }
125} 148}
126 149
127sub stop_game { 150sub stop_game {
151 return unless $CONN;
152
153 status "connection closed";
154 $LOGIN_BUTTON->set_text ("Login");
155 $CONN->destroy;
156 $CONN = 0; # false, does not autovivify
157
158 undef $MAPCACHE;
128 undef $CONN; 159 undef $MAP;
129} 160}
130 161
131sub client_setup { 162sub client_setup {
132 my $dialog = new CFClient::UI::FancyFrame 163 my $dialog = new CFClient::UI::FancyFrame
133 title => "Client Setup", 164 title => "Client Setup",
… …
135 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 166 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
136 167
137 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 168 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
138 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 169 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
139 170
140 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 171 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
141 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 172 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
142 173
143 $mode_slider->connect (changed => sub { 174 $mode_slider->connect (changed => sub {
144 my ($self, $value) = @_; 175 my ($self, $value) = @_;
145 176
… …
170 } 201 }
171 ); 202 );
172 203
173 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 204 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
174 $table->add (1, $row++, new CFClient::UI::Slider 205 $table->add (1, $row++, new CFClient::UI::Slider
175 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 206 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
176 tooltip => "Enlarge or shrink the displayed map", 207 tooltip => "Enlarge or shrink the displayed map",
177 connect_changed => sub { 208 connect_changed => sub {
178 my ($self, $value) = @_; 209 my ($self, $value) = @_;
179 $CFG->{map_scale} = 0.05 * int $value / 0.05; 210 $CFG->{map_scale} = $value;
180 } 211 }
181 ); 212 );
182 213
183 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 214 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
184 $table->add (1, $row++, new CFClient::UI::CheckBox 215 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
211 } 242 }
212 ); 243 );
213 244
214 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 245 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
215 $table->add (1, $row++, new CFClient::UI::Slider 246 $table->add (1, $row++, new CFClient::UI::Slider
216 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 247 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
217 tooltip => "The font size used by most GUI elements", 248 tooltip => "The font size used by most GUI elements",
218 connect_changed => sub { 249 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
219 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
220# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
221 }
222 ); 250 );
223 251
224 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 252 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
225 $table->add (1, $row++, new CFClient::UI::Slider 253 $table->add (1, $row++, new CFClient::UI::Slider
226 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 254 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
227 tooltip => "The font size used by the server log window only", 255 tooltip => "The font size used by the server log window only",
228 connect_changed => sub { 256 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
229 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
230 }
231 ); 257 );
232 258
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 259 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
234 260
235 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
236 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
237 tooltip => "The font size used by the statistics window only", 263 tooltip => "The font size used by the statistics window only",
238 connect_changed => sub { 264 connect_changed => sub {
239 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 265 $CFG->{stat_fontsize} = $_[1];
240 &set_stats_window_fontsize; 266 &set_stats_window_fontsize;
241 } 267 }
242 ); 268 );
243 269
244 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 270 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
245 $table->add (1, $row++, new CFClient::UI::Slider 271 $table->add (1, $row++, new CFClient::UI::Slider
246 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 272 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
247 tooltip => "Adjust the size of the stats gauges at the bottom right", 273 tooltip => "Adjust the size of the stats gauges at the bottom right",
248 connect_changed => sub { 274 connect_changed => sub {
249 $CFG->{gauge_size} = $_[1]; 275 $CFG->{gauge_size} = $_[1];
250 my $h = int $HEIGHT * $CFG->{gauge_size}; 276 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
251 $GAUGES->{win}->set_size ($WIDTH, $h);
252 $GAUGES->{win}->move (0, $HEIGHT - $h);
253 } 277 }
254 ); 278 );
255 279
256 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
257 $table->add (1, $row++, new CFClient::UI::Slider 281 $table->add (1, $row++, new CFClient::UI::Slider
258 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 282 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
259 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 283 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
260 connect_changed => sub { 284 connect_changed => sub {
261 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 285 $CFG->{gauge_fontsize} = $_[1];
262 &set_gauge_window_fontsize; 286 &set_gauge_window_fontsize;
263 } 287 }
264 ); 288 );
265 289
266 $table->add (1, $row++, new CFClient::UI::Button 290 $table->add (1, $row++, new CFClient::UI::Button
… …
309 audio_shutdown (); 333 audio_shutdown ();
310 audio_init (); 334 audio_init ();
311 } 335 }
312 ); 336 );
313 337
338 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
339 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
340 text => $CFG->{say_command},
341 tooltip => "This is the command that will be used if you write a line in the message window entry. "
342 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
343 ."But you could also set it to 'tell <playername>' to only chat with that user.",
344 connect_changed => sub {
345 my ($self, $value) = @_;
346 $CFG->{say_command} = $value;
347 }
348 );
349
314 $dialog 350 $dialog
315} 351}
316 352
317sub set_stats_window_fontsize { 353sub set_stats_window_fontsize {
318 for (values %{$STATWIDS}) { 354 for (values %{$STATWIDS}) {
… …
328# local $GAUGES->{win}{parent};#d# 364# local $GAUGES->{win}{parent};#d#
329# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 365# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
330} 366}
331 367
332sub make_gauge_window { 368sub make_gauge_window {
333 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 369 my $gh = int $HEIGHT * $CFG->{gauge_size};
334# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
335 370
336 my $win = new CFClient::UI::Frame ( 371 my $win = new CFClient::UI::Frame (
337 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 372 req_y => -1,
373 user_w => $WIDTH,
374 user_h => $gh,
338 ); 375 );
376
339 $win->add (my $hbox = new CFClient::UI::HBox 377 $win->add (my $hbox = new CFClient::UI::HBox
340 children => [ 378 children => [
341 (new CFClient::UI::HBox expand => 1), 379 (new CFClient::UI::HBox expand => 1),
342 ($FLOORBOX = new CFClient::UI::VBox), 380 (new CFClient::UI::VBox children => [
381 (new CFClient::UI::Empty expand => 1),
382 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
383 ]),
343 (my $vbox = new CFClient::UI::VBox), 384 (my $vbox = new CFClient::UI::VBox),
344 ], 385 ],
345 ); 386 );
346 387
347 $vbox->add (new CFClient::UI::HBox 388 $vbox->add (new CFClient::UI::HBox
… …
351 (my $hb = new CFClient::UI::HBox), 392 (my $hb = new CFClient::UI::HBox),
352 ], 393 ],
353 ); 394 );
354 395
355 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 396 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
356 tooltip => "Health points - depletes when you get wounded, refills when you heal or idle"); 397 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.");
357 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 398 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
358 tooltip => "Spell points - deplete when you cast wizard spells, refills when you idle"); 399 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.");
359 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 400 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
360 tooltip => "Grace points - deplete when you cast priest spells, refills when you pray"); 401 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.");
361 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 402 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
362 tooltip => "Food - depletes with time, faster when you heal or build mana, refills when you eat healthy food"); 403 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.");
363 404
364 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 405 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
365 tooltip => "Experience points and level - increases when you kill monsters or successfully use skills"); 406 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.");
366 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 407 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
367 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 408 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
368 409
369 $GAUGES = { 410 $GAUGES = {
370 exp => $exp, win => $win, range => $rng, 411 exp => $exp, win => $win, range => $rng,
… …
375 416
376 $win 417 $win
377} 418}
378 419
379sub make_stats_window { 420sub make_stats_window {
380 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats"); 421 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
381 422
382 $tgw->add (my $vb = new CFClient::UI::VBox); 423 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
383 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 424 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
384 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 425 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
385 426
386 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 427 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
387 428
388 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 429 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
389 430
390 my $black = [0, 0, 0]; 431 my $black = [0, 0, 0];
391 432
392 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 433 for (
393 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 434 [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
394 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 435 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"],
395 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 436 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"],
396 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 437 [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"],
397 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 438 [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
398 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 439 [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"],
440 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."],
399 441
400 $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Str"); 442 [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."],
401 $tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dex"); 443 [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."],
402 $tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Con"); 444 [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."],
403 $tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Int"); 445 [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."],
404 $tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wis"); 446 [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."],
405 $tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Pow"); 447 [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."],
406 $tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Cha"); 448 ) {
449 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
407 450
408 $tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120"); 451 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
409 $tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120"); 452 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
410 $tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120"); 453 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
411 $tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120"); 454 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip);
412 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54"); 455 }
413 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
414
415 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wc");
416 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Ac");
417 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dam");
418 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Arm");
419 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Sp");
420 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "WSp");
421 456
422 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 457 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
423 458
424 my $row = 0; 459 my $row = 0;
425 my $col = 0; 460 my $col = 0;
426 461
427 my %resist_names = ( 462 my %resist_names = (
428 slow => "Slow", 463 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.)",
429 holyw => "Holy Word", 464 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
430 conf => "Confusion", 465 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
431 fire => "Fire", 466 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
432 depl => "Depletion", 467 depl => "Depletion (some monsters and other effects can cause stats depletion)",
433 magic => "Magic", 468 magic => "Magic (resistance to magic spells like magic missile or similar)",
434 drain => "Draining", 469 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
435 acid => "Acid", 470 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
436 pois => "Poison", 471 pois => "Poison (resistance to getting poisoned)",
437 para => "Paralysation", 472 para => "Paralysation (this resistance affects the chance you get paralysed)",
438 deat => "Death", 473 deat => "Death (resistance against death spells)",
439 phys => "Physical", 474 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
440 blind => "Blind", 475 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
441 fear => "Fear", 476 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)",
442 tund => "Turn undead", 477 tund => "Turn undead",
443 elec => "Electricity", 478 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
444 cold => "Cold", 479 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
445 ghit => "Ghost hit", 480 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
446 ); 481 );
447 for (qw/slow holyw conf fire depl magic 482 for (qw/slow holyw conf fire depl magic
448 drain acid pois para deat phys 483 drain acid pois para deat phys
449 blind fear tund elec cold ghit/) 484 blind fear tund elec cold ghit/)
450 { 485 {
451 $tbl2->add ($col, $row, 486 $tbl2->add ($col, $row,
452 $STATWIDS->{"res_$_"} = 487 $STATWIDS->{"res_$_"} =
453 new CFClient::UI::Label 488 new CFClient::UI::Label
489 font => $FONT_FIXED,
454 template => "-100%", 490 template => "-100%",
455 align => +1, 491 align => +1,
456 valign => 0, 492 valign => 0,
493 can_events => 1,
494 can_hover => 1,
457 tooltip => $resist_names{$_} 495 tooltip => $resist_names{$_},
458 ); 496 );
459 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 497 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
498 font => $FONT_FIXED,
460 can_hover => 1, 499 can_hover => 1,
461 can_events => 1, 500 can_events => 1,
462 image => "ui/resist/resist_$_.png", 501 image => "ui/resist/resist_$_.png",
463 tooltip => $resist_names{$_} 502 tooltip => $resist_names{$_},
464 ); 503 );
465 504
466 $row++; 505 $row++;
467 if ($row % 6 == 0) { 506 if ($row % 6 == 0) {
468 $col += 2; 507 $col += 2;
… …
547 586
548} 587}
549 588
550sub metaserver_dialog { 589sub metaserver_dialog {
551 my $dialog = new CFClient::UI::FancyFrame 590 my $dialog = new CFClient::UI::FancyFrame
552 title => "Metaserver", 591 title => "Server List",
553 child => (my $vbox = new CFClient::UI::VBox); 592 child => (my $vbox = new CFClient::UI::VBox);
554 593
555 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 594 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
556 595
557 $dialog 596 $dialog
558} 597}
598
599my $METASERVER_ATIME;
559 600
560sub update_metaserver { 601sub update_metaserver {
561 my ($HOST) = @_; 602 my ($HOST) = @_;
562 603
563 status "fetching metaserver list..."; 604 return if $METASERVER_ATIME > time;
605 $METASERVER_ATIME = time + 60;
606
607 my $table = $METASERVER->{table};
608 $table->clear;
609 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
564 610
565 my $buf; 611 my $buf;
566 612
567 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 613 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
614
615 unless ($fh) {
616 $label->set_text ("unable to contact metaserver: $!");
617 return;
618 }
568 619
569 Event->io (fd => $fh, poll => 'r', cb => sub { 620 Event->io (fd => $fh, poll => 'r', cb => sub {
570 my $res = sysread $fh, $buf, 8192, length $buf; 621 my $res = sysread $fh, $buf, 8192, length $buf;
571 622
572 if (!defined $res) { 623 if (!defined $res) {
573 $_[0]->w->cancel; 624 $_[0]->w->cancel;
574 status "metaserver: $!"; 625 $label->set_text ("error while retrieving server list: $!");
575 } elsif ($res == 0) { 626 } elsif ($res == 0) {
576 $_[0]->w->cancel; 627 $_[0]->w->cancel;
577 status "server list retrieved"; 628 status "server list retrieved";
578 629
579 my $table = $METASERVER->{table}; 630 utf8::decode $buf if utf8::valid $buf;
580 631
581 $table->clear; 632 $table->clear;
582 633
583 my @col = qw(Use #Users Host Uptime Version Description); 634 my @col = qw(Use #Users Host Uptime Version Description);
584 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 635 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
… …
608 $m = [$users, $host, $uptime, $version, $desc]; 659 $m = [$users, $host, $uptime, $version, $desc];
609 660
610 $y++; 661 $y++;
611 662
612 $table->add (0, $y, new CFClient::UI::VBox children => [ 663 $table->add (0, $y, new CFClient::UI::VBox children => [
613 (new CFClient::UI::Button text => " ", connect_activate => sub { 664 (new CFClient::UI::Button text => "Use", connect_activate => sub {
614 $HOST->set_text ($CFG->{host} = $host); 665 $HOST->set_text ($CFG->{host} = $host);
615 }), 666 }),
616 (new CFClient::UI::Empty expand => 1), 667 (new CFClient::UI::Empty expand => 1),
617 ]); 668 ]);
618 669
… …
647 698
648 $METASERVER = metaserver_dialog; 699 $METASERVER = metaserver_dialog;
649 700
650 $vbox->add (new CFClient::UI::Flopper 701 $vbox->add (new CFClient::UI::Flopper
651 expand => 1, 702 expand => 1,
652 text => "Metaserver", 703 text => "Server List",
653 other => $METASERVER, 704 other => $METASERVER,
654 tooltip => "Show a list of avaible crossfire servers", 705 tooltip => "Show a list of available crossfire servers",
655 connect_open => sub { 706 connect_open => sub {
656 update_metaserver $HOST; 707 update_metaserver $HOST;
657 } 708 }
658 ); 709 );
659 } 710 }
… …
677 my ($self, $value) = @_; 728 my ($self, $value) = @_;
678 $CFG->{password} = $value; 729 $CFG->{password} = $value;
679 } 730 }
680 ); 731 );
681 732
682 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
683 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
684 text => $CFG->{say_command},
685 tooltip => "This is the command that will be used if you write a line in the message window entry. "
686 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
687 ."But you could also set it to 'tell <playername>' to only chat with that user.",
688 connect_changed => sub {
689 my ($self, $value) = @_;
690 $CFG->{say_command} = $value;
691 }
692 );
693
694 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 733 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
695 $table->add (1, 7, new CFClient::UI::Slider 734 $table->add (1, 7, new CFClient::UI::Slider
696 req_w => 100, 735 req_w => 100,
697 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 736 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
698 tooltip => "This is the size of the portion of the map update the server sends you. " 737 tooltip => "This is the size of the portion of the map update the server sends you. "
699 ."If you set this to a high value you will be able to see further for example.", 738 ."If you set this to a high value you will be able to see further for example.",
700 connect_changed => sub { 739 connect_changed => sub {
701 my ($self, $value) = @_; 740 my ($self, $value) = @_;
702 741
703 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 742 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
704 }, 743 },
705 ); 744 );
706 745
707 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 746 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
747 expand => 1,
748 align => 0,
749 text => "Login",
750 connect_activate => sub {
751 $CONN ? stop_game
708 start_game; 752 : start_game;
753 },
709 }); 754 );
710 755
711 $dialog 756 $dialog
712} 757}
713 758
714sub message_window { 759sub message_window {
715 my $window = new CFClient::UI::FancyFrame 760 my $window = new CFClient::UI::FancyFrame
716 title => "Messages", 761 title => "Messages",
717 border_bg => [1, 1, 1, 0.5], 762 border_bg => [1, 1, 1, 1],
718 bg => [0.3, 0.3, 0.3, 0.8], 763 bg => [0, 0, 0, 0.5],
719 user_w => int $::WIDTH / 3, 764 user_w => int $::WIDTH / 3,
720 user_h => int $::HEIGHT / 5, 765 user_h => int $::HEIGHT / 5,
721 child => (my $vbox = new CFClient::UI::VBox); 766 child => (my $vbox = new CFClient::UI::VBox);
722 767
723 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 768 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
763 }; 808 };
764 809
765 $window 810 $window
766} 811}
767 812
813sub make_inventory_window {
814 my $invwin = new CFClient::UI::FancyFrame
815 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
816
817 $invwin->add (my $hb = new CFClient::UI::HBox);
818 $hb->add ($INV = new CFClient::UI::Inventory expand => 1);
819 $hb->add ($INVR = new CFClient::UI::Inventory expand => 1);
820
821 $invwin
822}
823
768sub sdl_init { 824sub sdl_init {
769 CFClient::SDL_Init 825 CFClient::SDL_Init
770 and die "SDL::Init failed!\n"; 826 and die "SDL::Init failed!\n";
771} 827}
772 828
773sub video_init { 829sub video_init {
774 sdl_init; 830 sdl_init;
775 831
832 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
833
776 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 834 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
777 $FULLSCREEN = $CFG->{fullscreen}; 835 $FULLSCREEN = $CFG->{fullscreen};
778 $FAST = $CFG->{fast}; 836 $FAST = $CFG->{fast};
779 837
780 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 838 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
781 or die "SDL_SetVideoMode failed!\n"; 839 or die "SDL_SetVideoMode failed!\n";
782 840
783 $SDL_ACTIVE = 1; 841 $SDL_ACTIVE = 1;
784
785 $LAST_REFRESH = time - 0.01; 842 $LAST_REFRESH = time - 0.01;
786 843
787 CFClient::gl_init; 844 CFClient::gl_init;
788 845
789 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 846 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
790 847
848 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
849
791 ############################################################################# 850 #############################################################################
792 851
852 unless ($DEBUG_STATUS) {
853 # create the widgets
854
793 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 855 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
794 $DEBUG_STATUS->show; 856 $DEBUG_STATUS->show;
795 857
796 $STATUS_LINE = new CFClient::UI::Label 858 $STATUSBOX = new CFClient::UI::Statusbox;
797 padding => 0, 859 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
798 y => $HEIGHT - $FONTSIZE * 1.8;
799 $STATUS_LINE->show;
800 860
801 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 861 (new CFClient::UI::Frame
802 padding => 0, 862 bg => [0, 0, 0, 0.4],
803 fontsize => 0.8, 863 req_y => -1,
804 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 864 child => $STATUSBOX,
805 $ALT_ENTER_MESSAGE->show; 865 )->show;
806 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
807 866
808 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 867 CFClient::UI::FancyFrame->new (
809 $MAPWIDGET->focus_in; 868 border_bg => [1, 1, 1, 192/255],
869 bg => [1, 1, 1, 0],
870 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
871 )->show;
872
873 $MAPWIDGET = new CFClient::MapWidget;
810 $MAPWIDGET->connect (activate_console => sub { 874 $MAPWIDGET->connect (activate_console => sub {
811 my ($mapwidget, $preset) = @_; 875 my ($mapwidget, $preset) = @_;
812 876
813 if ($CONSOLE) { 877 if ($CONSOLE) {
814 $CONSOLE->{input}->{auto_activated} = 1; 878 $CONSOLE->{input}->{auto_activated} = 1;
815 $CONSOLE->{input}->focus_in; 879 $CONSOLE->{input}->focus_in;
816 880
817 if ($preset && $CONSOLE->{input}->get_text eq '') { 881 if ($preset && $CONSOLE->{input}->get_text eq '') {
818 $CONSOLE->{input}->set_text ($preset); 882 $CONSOLE->{input}->set_text ($preset);
883 }
819 } 884 }
820 } 885 });
821 }); 886 $MAPWIDGET->show;
887 $MAPWIDGET->focus_in;
822 888
823 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 889 $BUTTONBAR = new CFClient::UI::HBox;
824 890
825 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 891 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
826 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 892 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
827 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 893 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
828 894
829 $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 895 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
896
830 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 897 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
898 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
831 899
832 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 900 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
833 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 901 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
834 status "Configuration Saved"; 902 status "Configuration Saved";
835 }); 903 });
836 904
905 $BUTTONBAR->show;
906
907 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
908
909 # delay till geometry is constant
910 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
837 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 911 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
912 my $widget = $GAUGES->{win};
913 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
914 });
915 force_refresh ();
916 }
838} 917}
839 918
840sub video_shutdown { 919sub video_shutdown {
841 $CFClient::UI::ROOT->{children} = [];
842 undef $SDL_ACTIVE; 920 undef $SDL_ACTIVE;
843} 921}
844 922
845my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 923my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
846my $bgmusic;#TODO#hack#d# 924my $bgmusic;#TODO#hack#d#
925
926sub audio_channel_finished {
927 my ($channel) = @_;
928
929 warn "channel $channel finished\n";#d#
930}
847 931
848sub audio_music_finished { 932sub audio_music_finished {
849 return unless $CFG->{bgm_enable}; 933 return unless $CFG->{bgm_enable};
850 934
851 # TODO: hack, do play loop and mood music 935 # TODO: hack, do play loop and mood music
… …
855 push @bgmusic, shift @bgmusic; 939 push @bgmusic, shift @bgmusic;
856} 940}
857 941
858sub audio_init { 942sub audio_init {
859 if ($CFG->{audio_enable}) { 943 if ($CFG->{audio_enable}) {
860 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 944 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
861 $SDL_MIXER = !CFClient::Mix_OpenAudio; 945 $SDL_MIXER = !CFClient::Mix_OpenAudio;
862 CFClient::Mix_AllocateChannels 8; 946 CFClient::Mix_AllocateChannels 8;
863 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 947 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
864 948
865 audio_music_finished; 949 audio_music_finished;
… …
892} 976}
893 977
894my %animate_object; 978my %animate_object;
895my $animate_timer; 979my $animate_timer;
896 980
897my $want_refresh;
898my $can_refresh;
899
900my $fps = 9; 981my $fps = 9;
901 982
902sub force_refresh { 983sub force_refresh {
903 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 984 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
904 debug sprintf "%3.2f", $fps; 985 debug sprintf "%3.2f", $fps;
905 986
906 $want_refresh = 0;
907 $can_refresh = 0;
908
909 $CFClient::UI::ROOT->draw; 987 $CFClient::UI::ROOT->draw;
910
911 CFClient::SDL_GL_SwapBuffers; 988 CFClient::SDL_GL_SwapBuffers;
912 989
990 $WANT_REFRESH = 0;
991 $CAN_REFRESH = 0;
913 $LAST_REFRESH = $NOW; 992 $LAST_REFRESH = $NOW;
914} 993}
915 994
916my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 995my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
917 $NOW = time; 996 $NOW = time;
… …
919 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 998 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
920 for CFClient::SDL_PollEvent; 999 for CFClient::SDL_PollEvent;
921 1000
922 if (%animate_object) { 1001 if (%animate_object) {
923 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1002 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
924 $want_refresh++; 1003 $WANT_REFRESH++;
925 } 1004 }
926 1005
927 if ($want_refresh) { 1006 if ($WANT_REFRESH) {
928 force_refresh; 1007 force_refresh;
929 } else { 1008 } else {
930 $can_refresh = 1; 1009 $CAN_REFRESH = 1;
931 } 1010 }
932}); 1011});
933
934sub refresh {
935 $want_refresh++;
936}
937 1012
938sub animation_start { 1013sub animation_start {
939 my ($widget) = @_; 1014 my ($widget) = @_;
940 $animate_object{$widget} = $widget; 1015 $animate_object{$widget} = $widget;
941} 1016}
… …
1020# at worst. 1095# at worst.
1021sub conn::flood_fill { 1096sub conn::flood_fill {
1022 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1097 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1023 1098
1024 # the server does not allow map paths > 6 1099 # the server does not allow map paths > 6
1025 return if 6 <= length $path; 1100 return if 7 <= length $path;
1026 1101
1027 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1102 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1028 1103
1029 for ( 1104 for (
1030 [1, 0, -1], 1105 [1, 0, -1],
… …
1073 1148
1074 $self->flush_map; 1149 $self->flush_map;
1075 1150
1076 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1151 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1077 1152
1078 my $mapmapw = 250; 1153 my $mapmapw = $MAPMAP->{w};
1079 my $mapmaph = 250; 1154 my $mapmaph = $MAPMAP->{h};
1080 1155
1081 $self->{neigh_rect} = [ 1156 $self->{neigh_rect} = [
1082 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1157 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1083 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1158 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1084 ]; 1159 ];
… …
1253 [0.55, 0.41, 0.13], 1328 [0.55, 0.41, 0.13],
1254 [0.99, 0.77, 0.26], 1329 [0.99, 0.77, 0.26],
1255 [0.74, 0.65, 0.41], 1330 [0.74, 0.65, 0.41],
1256 ); 1331 );
1257 1332
1333 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1334
1335 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
1336 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1337 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1338
1258 $LOGVIEW->add_paragraph ($color[$color], $text); 1339 $LOGVIEW->add_paragraph ($color[$color],
1340 join "\n", map "$time $_", split /\n/, $text);
1341
1342 $STATUSBOX->add ($text,
1343 group => $text,
1344 fg => $color[$color],
1345 timeout => 60,
1346 tooltip_font => $::FONT_FIXED,
1347 );
1348}
1349
1350sub conn::drawextinfo {
1351 my ($self, $color, $type, $subtype, $message) = @_;
1352
1353 $self->drawinfo ($color, $message);
1259} 1354}
1260 1355
1261sub conn::spell_add { 1356sub conn::spell_add {
1262 my ($self, $spell) = @_; 1357 my ($self, $spell) = @_;
1263 1358
… …
1276 1371
1277 for my $skill (values %{$self->{skill_info}}) { 1372 for my $skill (values %{$self->{skill_info}}) {
1278 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1373 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1279 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1374 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1280 } 1375 }
1376
1377 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1378 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1379 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1380 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1381}
1382
1383sub conn::eof {
1384 stop_game;
1281} 1385}
1282 1386
1283sub update_floorbox { 1387sub update_floorbox {
1284 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1388 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1389 return unless $CONN;
1390
1285 $FLOORBOX->clear; 1391 $FLOORBOX->clear;
1286 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1392 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1287 1393
1288 my @items = values %{ $CONN->{container}{0} }; 1394 my $count = 4;
1289 1395 for (@{ $CONN->{container}{0} }) {
1290 # we basically have to use the same sorting as everybody else 1396 if (--$count) {
1291 @items = sort { $a->{type} <=> $b->{type} } @items; 1397 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1292 1398 } else {
1293 for my $item (reverse @items) { 1399 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1294 my $desc = $item->{nrof} < 2
1295 ? $item->{name}
1296 : "$item->{nrof} $item->{name_pl}";
1297 # todo: animation widget, face widget, weight(?) etc.
1298 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1299 tooltip => (CFClient::UI::Label->escape ($desc)
1300 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1301 can_hover => 1,
1302 can_events => 1,
1303 connect_button_down => sub {
1304 my ($self, $ev, $x, $y) = @_;
1305
1306 # todo: maybe put examine on 1? but should just be a tooltip :(
1307 if ($ev->{button} == 1) {
1308 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1309 } elsif ($ev->{button} == 2) {
1310 $CONN->send ("apply $item->{tag}");
1311 } elsif ($ev->{button} == 3) {
1312 # examine, lock, mark, maybe other things
1313 warn "MENU not implemented yet\n";
1314 }
1315
1316 1
1317 }, 1400 last;
1318 );
1319
1320 $hbox->add (new CFClient::UI::Face
1321 can_events => 0,
1322 face => $item->{face},
1323 anim => $item->{anim},
1324 animspeed => $item->{animspeed},
1325 );
1326 1401 }
1327 $hbox->add (new CFClient::UI::Label
1328 can_events => 0,
1329 text => $desc,
1330 );
1331 } 1402 }
1332 }); 1403 });
1333 refresh; 1404
1405 $WANT_REFRESH++;
1334} 1406}
1335 1407
1336sub conn::container_add { 1408sub conn::container_add {
1337 my ($self, $id, $items) = @_; 1409 my ($self, $tag, $items) = @_;
1338 1410
1339 update_floorbox if $id == 0; 1411 if ($tag == 0) {
1412 update_floorbox;
1413 $INVR->set_items ($self->{container}{0});
1414 $OPENCONT = 0;
1415 } elsif ($tag == $self->{player}{tag}) {
1416 $INV->set_items ($self->{container}{$self->{player}{tag}})
1417 } else {
1418 $OPENCONT = $tag;
1419 $INVR->set_items ($self->{container}{$tag});
1420 }
1421
1340 # $self-<{player}{tag} => player inv 1422 # $self-<{player}{tag} => player inv
1341 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1423 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1342} 1424}
1343 1425
1344sub conn::container_clear { 1426sub conn::container_clear {
1345 my ($self, $id) = @_; 1427 my ($self, $tag) = @_;
1346 1428
1347 update_floorbox if $id == 0; 1429 if ($tag == 0) {
1430 update_floorbox;
1431 $INVR->set_items ($self->{container}{0});
1432 $OPENCONT = 0;
1433 } elsif ($tag == $self->{player}{tag}) {
1434 $INV->set_items ($self->{container}{$tag})
1435 } else {
1436 $INVR->set_items ($self->{container}{$tag});
1437 $OPENCONT = $tag;
1438 }
1439
1348# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1440# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1349} 1441}
1350 1442
1351sub conn::item_delete { 1443sub conn::item_delete {
1352 my ($self, @items) = @_; 1444 my ($self, @items) = @_;
1353 1445
1354 for (@items) { 1446 for (@items) {
1355 update_floorbox if $_->{container} == 0; 1447 if ($_->{container} == 0) {
1448 update_floorbox;
1449 $INVR->set_items ($self->{container}{0});
1450 } elsif ($_->{container} == $self->{player}{tag}) {
1451 $INV->set_items ($self->{container}{$self->{player}{tag}})
1452 } else {
1453 $INVR->set_items ($self->{container}{0});
1454 }
1356 } 1455 }
1357} 1456}
1358 1457
1359sub conn::item_update { 1458sub conn::item_update {
1360 my ($self, $item) = @_; 1459 my ($self, $item) = @_;
1361 1460
1362 update_floorbox if $item->{container} == 0; 1461 if ($item->{container} == 0) {
1462 update_floorbox;
1463 $INVR->set_items ($self->{container}{0});
1464 } elsif ($item->{container} == $self->{player}{tag}) {
1465 $INV->set_items ($self->{container}{$item->{container}})
1466 }
1363} 1467}
1364 1468
1365%SDL_CB = ( 1469%SDL_CB = (
1366 CFClient::SDL_QUIT => sub { 1470 CFClient::SDL_QUIT => sub {
1367 Event::unloop -1; 1471 Event::unloop -1;
1368 }, 1472 },
1369 CFClient::SDL_VIDEORESIZE => sub { 1473 CFClient::SDL_VIDEORESIZE => sub {
1370 }, 1474 },
1371 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1475 CFClient::SDL_VIDEOEXPOSE => sub {
1476 $WANT_REFRESH++;
1477 },
1372 CFClient::SDL_ACTIVEEVENT => sub { 1478 CFClient::SDL_ACTIVEEVENT => sub {
1373# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1479# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1374 }, 1480 },
1375 CFClient::SDL_KEYDOWN => sub { 1481 CFClient::SDL_KEYDOWN => sub {
1376 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1482 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1380 video_init; 1486 video_init;
1381 } else { 1487 } else {
1382 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1488 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1383 } 1489 }
1384 }, 1490 },
1385 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1491 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1386 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1492 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1387 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1493 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1388 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1494 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1389 CFClient::SDL_USEREVENT => \&audio_music_finished, 1495 CFClient::SDL_USEREVENT => sub {
1496 if ($_[0]{code} == 1) {
1497 audio_channel_finished $_[0]{data1};
1498 } elsif ($_[0]{code} == 0) {
1499 audio_music_finished;
1500 }
1501 },
1390); 1502);
1391 1503
1392############################################################################# 1504#############################################################################
1393 1505
1394$SIG{INT} = $SIG{TERM} = sub { exit }; 1506$SIG{INT} = $SIG{TERM} = sub { exit };
1395 1507
1396$TILECACHE = CFClient::db_table "tilecache";
1397$FACEMAP = CFClient::db_table "facemap";
1398
1399CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1400
1401my %DEF_CFG = (
1402 sdl_mode => 0,
1403 width => 640,
1404 height => 480,
1405 fullscreen => 0,
1406 fast => 0,
1407 map_scale => 0.5,
1408 fow_enable => 1,
1409 fow_intensity => 0.45,
1410 fow_smooth => 0,
1411 gui_fontsize => 1,
1412 log_fontsize => 1,
1413 gauge_fontsize => 1,
1414 gauge_size => 0.35,
1415 stat_fontsize => 1,
1416 mapsize => 100,
1417 host => "crossfire.schmorp.de",
1418 say_command => 'say',
1419 audio_enable => 1,
1420 bgm_enable => 1,
1421 bgm_volume => 0.25,
1422);
1423
1424while (my ($k, $v) = each %DEF_CFG) {
1425 $CFG->{$k} = $v unless exists $CFG->{$k};
1426}
1427
1428sdl_init;
1429
1430@SDL_MODES = reverse
1431 grep $_->[0] >= 640 && $_->[1] >= 480,
1432 CFClient::SDL_ListModes;
1433
1434@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1435
1436$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1437
1438{ 1508{
1509 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1510
1511 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1512
1513 $TILECACHE = CFClient::db_table "tilecache";
1514 $FACEMAP = CFClient::db_table "facemap";
1515
1516 my %DEF_CFG = (
1517 sdl_mode => 0,
1518 width => 640,
1519 height => 480,
1520 fullscreen => 0,
1521 fast => 0,
1522 map_scale => 0.5,
1523 fow_enable => 1,
1524 fow_intensity => 0.45,
1525 fow_smooth => 0,
1526 gui_fontsize => 1,
1527 log_fontsize => 1,
1528 gauge_fontsize=> 1,
1529 gauge_size => 0.35,
1530 stat_fontsize => 1,
1531 mapsize => 100,
1532 host => "crossfire.schmorp.de",
1533 say_command => 'say',
1534 audio_enable => 1,
1535 bgm_enable => 1,
1536 bgm_volume => 0.25,
1537 );
1538
1539 while (my ($k, $v) = each %DEF_CFG) {
1540 $CFG->{$k} = $v unless exists $CFG->{$k};
1541 }
1542
1543 sdl_init;
1544
1545 @SDL_MODES = reverse
1546 grep $_->[0] >= 640 && $_->[1] >= 480,
1547 CFClient::SDL_ListModes;
1548
1549 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1550
1551 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1552
1553 {
1439 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1554 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1440 DejaVuSans.ttf 1555 DejaVuSans.ttf
1441 DejaVuSansMono.ttf 1556 DejaVuSansMono.ttf
1442 DejaVuSans-Bold.ttf 1557 DejaVuSans-Bold.ttf
1443 DejaVuSansMono-Bold.ttf 1558 DejaVuSansMono-Bold.ttf
1444 DejaVuSans-Oblique.ttf 1559 DejaVuSans-Oblique.ttf
1445 DejaVuSansMono-Oblique.ttf 1560 DejaVuSansMono-Oblique.ttf
1446 DejaVuSans-BoldOblique.ttf 1561 DejaVuSans-BoldOblique.ttf
1447 DejaVuSansMono-BoldOblique.ttf 1562 DejaVuSansMono-BoldOblique.ttf
1448 ); 1563 );
1449 1564
1450 CFClient::add_font $_ for @fonts; 1565 CFClient::add_font $_ for @fonts;
1451 1566
1567 CFClient::pango_init;
1568
1452 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1569 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1453 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1570 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1454 1571
1455 $FONT_PROP->make_default; 1572 $FONT_PROP->make_default;
1456} 1573 }
1457 1574
1458video_init; 1575 video_init;
1459audio_init; 1576 audio_init;
1577}
1460 1578
1461Event::loop; 1579Event::loop;
1462 1580
1463END { CFClient::SDL_Quit } 1581END { CFClient::SDL_Quit }
1464 1582
1583=head1 pclient - Crossfire+ and Crossfire game client
1465 1584
1585Pclient is a Crossfire+ and Crossfire game client.
1586
1587=head2 Features
1588
1589=over 4
1590
1591=item Fullscreen Map
1592
1593PClient can uses a fullscreen map, which greatly enhances how much of the
1594game world you can see.
1595
1596=item Persistent Map Cache (Crossfire+ only)
1597
1598PClient can persistently cache all map data it received from the
1599server. This not only allows it to display an overview map, but also
1600ensures that once-explored areas will be available the next time you want
1601to explore more.
1602
1603=item Hardware acceleration
1604
1605Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
1606acceleration. Most modern graphics cards have difficulties with 2D
1607acceleration, while 3D graphics is accelerated well.
1608
1609=item No arbitrary limits
1610
1611Unlike other Crossfire clients, pclient does not suffer from arbitrary
1612limits (like a fixed amount of face numbers). There are still limits, but
1613they are not arbitrarily low :)
1614
1615=back
1616
1617=head1 USAGE
1618
1619=head2 The Map
1620
1621The map is always displayed in the background, behind all other windows and UI elements.
1622
1623#TODO# middle-click scrolls
1624#
1625# keys:
1626#
1627# a apply
1628# keypad moves, kp_5 applies ranged attack to self
1629
1630Starting to type enters the I<completion mode>. In that mode, you can type
1631abbreviations or commands and have them executed as soon as they match a
1632valid command. This is best explained by a few examples:
1633
1634Typing B<climb> will display a list of commands with I<climb> in their
1635name, such as I<ready_skill climbing> and I<use_skill climbing>.
1636
1637You can abbreviate commands by typing only the first character of every
1638word. For example, typing I<iwor> will likely select I<invoke word of
1639recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1640will likely select I<ready_skill climbing> and I<usl> will give you
1641I<use_skill levitation>.
1642
1643=head2 The map overview
1644
1645#TODO#
1646
1647=head2 The Status area in the lower right corner
1648
1649#TODO#
1650
1651=head2 The I<Statistics>/I>Stats> window
1652
1653#TODO#
1654
1655=head1 FAQ
1656
1657=over 4
1658
1659=item The client is very sluggish and slow, what can I do about this?
1660
1661Most likely, you don't have accelerated OpenGL support. Try to find a
1662newer driver, or a driver from your hardware vendor, that features OpenGL
1663support.
1664
1665If this is not an option, the following Setup options reduce the load and
1666will likely make the client playable with sofwtare rendering (it will
1667still be slow, though):
1668
1669=over 4
1670
1671=item B<Video Mode> should be set as low as possible (e.g. 640x480)
1672
1673=item Enable B<Fast & Ugly> mode
1674
1675=item Disable B<Fog of War>
1676
1677=item Increase B<Map Scale>
1678
1679=back
1680
1681=back
1682
1683=head1 AUTHOR
1684
1685Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1686
1687
1688

Diff Legend

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