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.178 by root, Tue Apr 25 08:39:18 2006 UTC vs.
Revision 1.223 by elmex, Wed May 17 14:55:15 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines