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.216 by root, Mon May 15 17:45:31 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;
104
96sub status { 105sub status {
97 $STATUS_LINE->set_text ($_[0]); 106 $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} 107}
100 108
101sub debug { 109sub debug {
102 $DEBUG_STATUS->set_text ($_[0]); 110 $DEBUG_STATUS->set_text ($_[0]);
103 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 111 my ($w, $h) = $DEBUG_STATUS->size_request;
112 $DEBUG_STATUS->move ($WIDTH - $w, 0);
104} 113}
105 114
106sub start_game { 115sub start_game {
107 status "logging in..."; 116 status "logging in...";
108 117
109 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 118 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
110 119
111 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 120 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
112
113 $MAP = new CFClient::Map $mapsize, $mapsize; 121 $MAP = new CFClient::Map $mapsize, $mapsize;
114 122
115 my ($host, $port) = split /:/, $CFG->{host}; 123 my ($host, $port) = split /:/, $CFG->{host};
116 124
117 $CONN = new conn 125 $CONN = eval {
126 new conn
118 host => $host, 127 host => $host,
119 port => $port || 13327, 128 port => $port || 13327,
120 user => $CFG->{user}, 129 user => $CFG->{user},
121 pass => $CFG->{password}, 130 pass => $CFG->{password},
122 mapw => $mapsize, 131 mapw => $mapsize,
123 maph => $mapsize, 132 maph => $mapsize,
133 ;
124 ; 134 };
125 135
136 if ($CONN) {
137 $LOGIN_BUTTON->set_text ("Logout");
138
126 status "login successful"; 139 status "login successful";
127 140
128 CFClient::lowdelay fileno $CONN->{fh}; 141 CFClient::lowdelay fileno $CONN->{fh};
142 } else {
143 status "unable to connect";
144 stop_game();
145 }
129} 146}
130 147
131sub stop_game { 148sub stop_game {
149 return unless $CONN;
150
151 status "connection closed";
152 $LOGIN_BUTTON->set_text ("Login");
153 $CONN->destroy;
154 $CONN = 0; # false, does not autovivify
155
156 undef $MAPCACHE;
132 undef $CONN; 157 undef $MAP;
133} 158}
134 159
135sub client_setup { 160sub client_setup {
136 my $dialog = new CFClient::UI::FancyFrame 161 my $dialog = new CFClient::UI::FancyFrame
137 title => "Client Setup", 162 title => "Client Setup",
… …
139 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 164 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
140 165
141 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 166 $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); 167 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
143 168
144 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 169 $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"); 170 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
146 171
147 $mode_slider->connect (changed => sub { 172 $mode_slider->connect (changed => sub {
148 my ($self, $value) = @_; 173 my ($self, $value) = @_;
149 174
… …
174 } 199 }
175 ); 200 );
176 201
177 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 202 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
178 $table->add (1, $row++, new CFClient::UI::Slider 203 $table->add (1, $row++, new CFClient::UI::Slider
179 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 204 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
180 tooltip => "Enlarge or shrink the displayed map", 205 tooltip => "Enlarge or shrink the displayed map",
181 connect_changed => sub { 206 connect_changed => sub {
182 my ($self, $value) = @_; 207 my ($self, $value) = @_;
183 $CFG->{map_scale} = 0.05 * int $value / 0.05; 208 $CFG->{map_scale} = $value;
184 } 209 }
185 ); 210 );
186 211
187 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 212 $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 213 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
215 } 240 }
216 ); 241 );
217 242
218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
219 $table->add (1, $row++, new CFClient::UI::Slider 244 $table->add (1, $row++, new CFClient::UI::Slider
220 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 245 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
221 tooltip => "The font size used by most GUI elements", 246 tooltip => "The font size used by most GUI elements",
222 connect_changed => sub { 247 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 ); 248 );
227 249
228 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 250 $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 251 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 252 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
231 tooltip => "The font size used by the server log window only", 253 tooltip => "The font size used by the server log window only",
232 connect_changed => sub { 254 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
233 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
234 }
235 ); 255 );
236 256
237 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 257 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
238 258
239 $table->add (1, $row++, new CFClient::UI::Slider 259 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 260 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
241 tooltip => "The font size used by the statistics window only", 261 tooltip => "The font size used by the statistics window only",
242 connect_changed => sub { 262 connect_changed => sub {
243 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 263 $CFG->{stat_fontsize} = $_[1];
244 &set_stats_window_fontsize; 264 &set_stats_window_fontsize;
245 } 265 }
246 ); 266 );
247 267
248 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
249 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 270 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
251 tooltip => "Adjust the size of the stats gauges at the bottom right", 271 tooltip => "Adjust the size of the stats gauges at the bottom right",
252 connect_changed => sub { 272 connect_changed => sub {
253 $CFG->{gauge_size} = $_[1]; 273 $CFG->{gauge_size} = $_[1];
254 my $h = int $HEIGHT * $CFG->{gauge_size}; 274 $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 } 275 }
258 ); 276 );
259 277
260 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
261 $table->add (1, $row++, new CFClient::UI::Slider 279 $table->add (1, $row++, new CFClient::UI::Slider
262 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 280 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
263 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 281 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
264 connect_changed => sub { 282 connect_changed => sub {
265 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 283 $CFG->{gauge_fontsize} = $_[1];
266 &set_gauge_window_fontsize; 284 &set_gauge_window_fontsize;
267 } 285 }
268 ); 286 );
269 287
270 $table->add (1, $row++, new CFClient::UI::Button 288 $table->add (1, $row++, new CFClient::UI::Button
… …
313 audio_shutdown (); 331 audio_shutdown ();
314 audio_init (); 332 audio_init ();
315 } 333 }
316 ); 334 );
317 335
336 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
337 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
338 text => $CFG->{say_command},
339 tooltip => "This is the command that will be used if you write a line in the message window entry. "
340 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
341 ."But you could also set it to 'tell <playername>' to only chat with that user.",
342 connect_changed => sub {
343 my ($self, $value) = @_;
344 $CFG->{say_command} = $value;
345 }
346 );
347
318 $dialog 348 $dialog
319} 349}
320 350
321sub set_stats_window_fontsize { 351sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) { 352 for (values %{$STATWIDS}) {
… …
332# local $GAUGES->{win}{parent};#d# 362# local $GAUGES->{win}{parent};#d#
333# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 363# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
334} 364}
335 365
336sub make_gauge_window { 366sub make_gauge_window {
337 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 367 my $gh = int $HEIGHT * $CFG->{gauge_size};
338# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
339 368
340 my $win = new CFClient::UI::Frame ( 369 my $win = new CFClient::UI::Frame (
341 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 370 req_y => -1,
371 user_w => $WIDTH,
372 user_h => $gh,
342 ); 373 );
374
343 $win->add (my $hbox = new CFClient::UI::HBox 375 $win->add (my $hbox = new CFClient::UI::HBox
344 children => [ 376 children => [
345 (new CFClient::UI::HBox expand => 1), 377 (new CFClient::UI::HBox expand => 1),
346 ($FLOORBOX = new CFClient::UI::VBox), 378 (new CFClient::UI::VBox children => [
379 (new CFClient::UI::Empty expand => 1),
380 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
381 ]),
347 (my $vbox = new CFClient::UI::VBox), 382 (my $vbox = new CFClient::UI::VBox),
348 ], 383 ],
349 ); 384 );
350 385
351 $vbox->add (new CFClient::UI::HBox 386 $vbox->add (new CFClient::UI::HBox
… …
355 (my $hb = new CFClient::UI::HBox), 390 (my $hb = new CFClient::UI::HBox),
356 ], 391 ],
357 ); 392 );
358 393
359 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 394 $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"); 395 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', 396 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
362 tooltip => "Spell points - deplete when you cast wizard spells, refills when you idle"); 397 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', 398 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
364 tooltip => "Grace points - deplete when you cast priest spells, refills when you pray"); 399 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', 400 $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"); 401 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 402
368 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 403 $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"); 404 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, 405 $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.)"); 406 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
372 407
373 $GAUGES = { 408 $GAUGES = {
374 exp => $exp, win => $win, range => $rng, 409 exp => $exp, win => $win, range => $rng,
… …
379 414
380 $win 415 $win
381} 416}
382 417
383sub make_stats_window { 418sub make_stats_window {
384 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats"); 419 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
385 420
386 $tgw->add (my $vb = new CFClient::UI::VBox); 421 $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); 422 $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); 423 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
389 424
390 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 425 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
391 426
392 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 427 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
393 428
394 my $black = [0, 0, 0]; 429 my $black = [0, 0, 0];
395 430
396 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 431 for (
397 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 432 [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"); 433 [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"); 434 [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"); 435 [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"); 436 [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"); 437 [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"],
438 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."],
403 439
404 $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Str"); 440 [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"); 441 [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"); 442 [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"); 443 [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"); 444 [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"); 445 [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"); 446 ) {
447 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
411 448
412 $tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120"); 449 $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"); 450 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"); 451 $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"); 452 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"); 453 }
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 454
426 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 455 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
427 456
428 my $row = 0; 457 my $row = 0;
429 my $col = 0; 458 my $col = 0;
430 459
431 my %resist_names = ( 460 my %resist_names = (
432 slow => "Slow", 461 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", 462 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", 463 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
435 fire => "Fire", 464 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
436 depl => "Depletion", 465 depl => "Depletion (some monsters and other effects can cause stats depletion)",
437 magic => "Magic", 466 magic => "Magic (resistance to magic spells like magic missile or similar)",
438 drain => "Draining", 467 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
439 acid => "Acid", 468 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
440 pois => "Poison", 469 pois => "Poison (resistance to getting poisoned)",
441 para => "Paralysation", 470 para => "Paralysation (this resistance affects the chance you get paralysed)",
442 deat => "Death", 471 deat => "Death (resistance against death spells)",
443 phys => "Physical", 472 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
444 blind => "Blind", 473 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
445 fear => "Fear", 474 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", 475 tund => "Turn undead",
447 elec => "Electricity", 476 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
448 cold => "Cold", 477 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
449 ghit => "Ghost hit", 478 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
450 ); 479 );
451 for (qw/slow holyw conf fire depl magic 480 for (qw/slow holyw conf fire depl magic
452 drain acid pois para deat phys 481 drain acid pois para deat phys
453 blind fear tund elec cold ghit/) 482 blind fear tund elec cold ghit/)
454 { 483 {
455 $tbl2->add ($col, $row, 484 $tbl2->add ($col, $row,
456 $STATWIDS->{"res_$_"} = 485 $STATWIDS->{"res_$_"} =
457 new CFClient::UI::Label 486 new CFClient::UI::Label
487 font => $FONT_FIXED,
458 template => "-100%", 488 template => "-100%",
459 align => +1, 489 align => +1,
460 valign => 0, 490 valign => 0,
491 can_events => 1,
492 can_hover => 1,
461 tooltip => $resist_names{$_} 493 tooltip => $resist_names{$_},
462 ); 494 );
463 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 495 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
496 font => $FONT_FIXED,
464 can_hover => 1, 497 can_hover => 1,
465 can_events => 1, 498 can_events => 1,
466 image => "ui/resist/resist_$_.png", 499 image => "ui/resist/resist_$_.png",
467 tooltip => $resist_names{$_} 500 tooltip => $resist_names{$_},
468 ); 501 );
469 502
470 $row++; 503 $row++;
471 if ($row % 6 == 0) { 504 if ($row % 6 == 0) {
472 $col += 2; 505 $col += 2;
… …
551 584
552} 585}
553 586
554sub metaserver_dialog { 587sub metaserver_dialog {
555 my $dialog = new CFClient::UI::FancyFrame 588 my $dialog = new CFClient::UI::FancyFrame
556 title => "Metaserver", 589 title => "Server List",
557 child => (my $vbox = new CFClient::UI::VBox); 590 child => (my $vbox = new CFClient::UI::VBox);
558 591
559 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 592 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
560 593
561 $dialog 594 $dialog
562} 595}
596
597my $METASERVER_ATIME;
563 598
564sub update_metaserver { 599sub update_metaserver {
565 my ($HOST) = @_; 600 my ($HOST) = @_;
566 601
602 return if $METASERVER_ATIME > time;
603 $METASERVER_ATIME = time + 60;
604
567 my $table = $METASERVER->{table}; 605 my $table = $METASERVER->{table};
568 $table->clear; 606 $table->clear;
569 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching metaserver list..."); 607 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
570 608
571 my $buf; 609 my $buf;
572 610
573 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 611 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
574 612
… …
658 696
659 $METASERVER = metaserver_dialog; 697 $METASERVER = metaserver_dialog;
660 698
661 $vbox->add (new CFClient::UI::Flopper 699 $vbox->add (new CFClient::UI::Flopper
662 expand => 1, 700 expand => 1,
663 text => "Metaserver", 701 text => "Server List",
664 other => $METASERVER, 702 other => $METASERVER,
665 tooltip => "Show a list of avaible crossfire servers", 703 tooltip => "Show a list of available crossfire servers",
666 connect_open => sub { 704 connect_open => sub {
667 update_metaserver $HOST; 705 update_metaserver $HOST;
668 } 706 }
669 ); 707 );
670 } 708 }
… …
688 my ($self, $value) = @_; 726 my ($self, $value) = @_;
689 $CFG->{password} = $value; 727 $CFG->{password} = $value;
690 } 728 }
691 ); 729 );
692 730
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"); 731 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
706 $table->add (1, 7, new CFClient::UI::Slider 732 $table->add (1, 7, new CFClient::UI::Slider
707 req_w => 100, 733 req_w => 100,
708 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 734 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. " 735 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.", 736 ."If you set this to a high value you will be able to see further for example.",
711 connect_changed => sub { 737 connect_changed => sub {
712 my ($self, $value) = @_; 738 my ($self, $value) = @_;
713 739
714 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 740 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
715 }, 741 },
716 ); 742 );
717 743
718 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 744 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
745 expand => 1,
746 align => 0,
747 text => "Login",
748 connect_activate => sub {
749 $CONN ? stop_game
719 start_game; 750 : start_game;
751 },
720 }); 752 );
721 753
722 $dialog 754 $dialog
723} 755}
724 756
725sub message_window { 757sub message_window {
726 my $window = new CFClient::UI::FancyFrame 758 my $window = new CFClient::UI::FancyFrame
727 title => "Messages", 759 title => "Messages",
728 border_bg => [1, 1, 1, 0.5], 760 border_bg => [1, 1, 1, 1],
729 bg => [0.3, 0.3, 0.3, 0.8], 761 bg => [0, 0, 0, 0.5],
730 user_w => int $::WIDTH / 3, 762 user_w => int $::WIDTH / 3,
731 user_h => int $::HEIGHT / 5, 763 user_h => int $::HEIGHT / 5,
732 child => (my $vbox = new CFClient::UI::VBox); 764 child => (my $vbox = new CFClient::UI::VBox);
733 765
734 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 766 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
774 }; 806 };
775 807
776 $window 808 $window
777} 809}
778 810
811sub make_inventory_window {
812 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
813 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1);
814 $invwin
815}
816
779sub sdl_init { 817sub sdl_init {
780 CFClient::SDL_Init 818 CFClient::SDL_Init
781 and die "SDL::Init failed!\n"; 819 and die "SDL::Init failed!\n";
782} 820}
783 821
784sub video_init { 822sub video_init {
785 sdl_init; 823 sdl_init;
786 824
825 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
826
787 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 827 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
788 $FULLSCREEN = $CFG->{fullscreen}; 828 $FULLSCREEN = $CFG->{fullscreen};
789 $FAST = $CFG->{fast}; 829 $FAST = $CFG->{fast};
790 830
791 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 831 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
792 or die "SDL_SetVideoMode failed!\n"; 832 or die "SDL_SetVideoMode failed!\n";
793 833
794 $SDL_ACTIVE = 1; 834 $SDL_ACTIVE = 1;
795
796 $LAST_REFRESH = time - 0.01; 835 $LAST_REFRESH = time - 0.01;
797 836
798 CFClient::gl_init; 837 CFClient::gl_init;
799 838
800 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 839 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
801 840
841 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
842
802 ############################################################################# 843 #############################################################################
803 844
845 unless ($DEBUG_STATUS) {
846 # create the widgets
847
804 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 848 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
805 $DEBUG_STATUS->show; 849 $DEBUG_STATUS->show;
806 850
807 $STATUS_LINE = new CFClient::UI::Label 851 $STATUSBOX = new CFClient::UI::Statusbox;
808 padding => 0, 852 $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 853
812 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 854 (new CFClient::UI::Frame
813 padding => 0, 855 bg => [0, 0, 0, 0.4],
814 fontsize => 0.8, 856 req_y => -1,
815 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 857 child => $STATUSBOX,
816 $ALT_ENTER_MESSAGE->show; 858 )->show;
817 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
818 859
819 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 860 CFClient::UI::FancyFrame->new (
820 $MAPWIDGET->focus_in; 861 border_bg => [1, 1, 1, 192/255],
862 bg => [1, 1, 1, 0],
863 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
864 )->show;
865
866 $MAPWIDGET = new CFClient::MapWidget;
821 $MAPWIDGET->connect (activate_console => sub { 867 $MAPWIDGET->connect (activate_console => sub {
822 my ($mapwidget, $preset) = @_; 868 my ($mapwidget, $preset) = @_;
823 869
824 if ($CONSOLE) { 870 if ($CONSOLE) {
825 $CONSOLE->{input}->{auto_activated} = 1; 871 $CONSOLE->{input}->{auto_activated} = 1;
826 $CONSOLE->{input}->focus_in; 872 $CONSOLE->{input}->focus_in;
827 873
828 if ($preset && $CONSOLE->{input}->get_text eq '') { 874 if ($preset && $CONSOLE->{input}->get_text eq '') {
829 $CONSOLE->{input}->set_text ($preset); 875 $CONSOLE->{input}->set_text ($preset);
876 }
830 } 877 }
831 } 878 });
832 }); 879 $MAPWIDGET->show;
880 $MAPWIDGET->focus_in;
833 881
834 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 882 $BUTTONBAR = new CFClient::UI::HBox;
835 883
836 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 884 $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); 885 $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); 886 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
839 887
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 888 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
889
841 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 890 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
891 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
842 892
843 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 893 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
844 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 894 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
845 status "Configuration Saved"; 895 status "Configuration Saved";
846 }); 896 });
847 897
898 $BUTTONBAR->show;
899
900 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
901
902 # delay till geometry is constant
903 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
848 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 904 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
905 my $widget = $GAUGES->{win};
906 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
907 });
908 force_refresh ();
909 }
849} 910}
850 911
851sub video_shutdown { 912sub video_shutdown {
852 $CFClient::UI::ROOT->{children} = [];
853 undef $CFClient::UI::GRAB;
854 undef $CFClient::UI::HOVER;
855 undef $SDL_ACTIVE; 913 undef $SDL_ACTIVE;
856} 914}
857 915
858my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 916my @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# 917my $bgmusic;#TODO#hack#d#
918
919sub audio_channel_finished {
920 my ($channel) = @_;
921
922 warn "channel $channel finished\n";#d#
923}
860 924
861sub audio_music_finished { 925sub audio_music_finished {
862 return unless $CFG->{bgm_enable}; 926 return unless $CFG->{bgm_enable};
863 927
864 # TODO: hack, do play loop and mood music 928 # TODO: hack, do play loop and mood music
… …
868 push @bgmusic, shift @bgmusic; 932 push @bgmusic, shift @bgmusic;
869} 933}
870 934
871sub audio_init { 935sub audio_init {
872 if ($CFG->{audio_enable}) { 936 if ($CFG->{audio_enable}) {
873 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 937 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
874 $SDL_MIXER = !CFClient::Mix_OpenAudio; 938 $SDL_MIXER = !CFClient::Mix_OpenAudio;
875 CFClient::Mix_AllocateChannels 8; 939 CFClient::Mix_AllocateChannels 8;
876 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 940 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
877 941
878 audio_music_finished; 942 audio_music_finished;
… …
905} 969}
906 970
907my %animate_object; 971my %animate_object;
908my $animate_timer; 972my $animate_timer;
909 973
910my $want_refresh;
911my $can_refresh;
912
913my $fps = 9; 974my $fps = 9;
914 975
915sub force_refresh { 976sub force_refresh {
916 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 977 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
917 debug sprintf "%3.2f", $fps; 978 debug sprintf "%3.2f", $fps;
918 979
919 $want_refresh = 0;
920 $can_refresh = 0;
921
922 $CFClient::UI::ROOT->draw; 980 $CFClient::UI::ROOT->draw;
923
924 CFClient::SDL_GL_SwapBuffers; 981 CFClient::SDL_GL_SwapBuffers;
925 982
983 $WANT_REFRESH = 0;
984 $CAN_REFRESH = 0;
926 $LAST_REFRESH = $NOW; 985 $LAST_REFRESH = $NOW;
927} 986}
928 987
929my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 988my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
930 $NOW = time; 989 $NOW = time;
… …
932 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 991 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
933 for CFClient::SDL_PollEvent; 992 for CFClient::SDL_PollEvent;
934 993
935 if (%animate_object) { 994 if (%animate_object) {
936 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 995 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
937 $want_refresh++; 996 $WANT_REFRESH++;
938 } 997 }
939 998
940 if ($want_refresh) { 999 if ($WANT_REFRESH) {
941 force_refresh; 1000 force_refresh;
942 } else { 1001 } else {
943 $can_refresh = 1; 1002 $CAN_REFRESH = 1;
944 } 1003 }
945}); 1004});
946
947sub refresh {
948 $want_refresh++;
949}
950 1005
951sub animation_start { 1006sub animation_start {
952 my ($widget) = @_; 1007 my ($widget) = @_;
953 $animate_object{$widget} = $widget; 1008 $animate_object{$widget} = $widget;
954} 1009}
… …
1033# at worst. 1088# at worst.
1034sub conn::flood_fill { 1089sub conn::flood_fill {
1035 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1090 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1036 1091
1037 # the server does not allow map paths > 6 1092 # the server does not allow map paths > 6
1038 return if 6 <= length $path; 1093 return if 7 <= length $path;
1039 1094
1040 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1095 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1041 1096
1042 for ( 1097 for (
1043 [1, 0, -1], 1098 [1, 0, -1],
… …
1086 1141
1087 $self->flush_map; 1142 $self->flush_map;
1088 1143
1089 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1144 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1090 1145
1091 my $mapmapw = 250; 1146 my $mapmapw = $MAPMAP->{w};
1092 my $mapmaph = 250; 1147 my $mapmaph = $MAPMAP->{h};
1093 1148
1094 $self->{neigh_rect} = [ 1149 $self->{neigh_rect} = [
1095 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1150 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1096 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1151 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1097 ]; 1152 ];
… …
1266 [0.55, 0.41, 0.13], 1321 [0.55, 0.41, 0.13],
1267 [0.99, 0.77, 0.26], 1322 [0.99, 0.77, 0.26],
1268 [0.74, 0.65, 0.41], 1323 [0.74, 0.65, 0.41],
1269 ); 1324 );
1270 1325
1326 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1327
1328 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
1329 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1330 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1331
1271 $LOGVIEW->add_paragraph ($color[$color], $text); 1332 $LOGVIEW->add_paragraph ($color[$color],
1333 join "\n", map "$time $_", split /\n/, $text);
1334
1335 $STATUSBOX->add ($text,
1336 group => $text,
1337 fg => $color[$color],
1338 timeout => 60,
1339 tooltip_font => $::FONT_FIXED,
1340 );
1341}
1342
1343sub conn::drawextinfo {
1344 my ($self, $color, $type, $subtype, $message) = @_;
1345
1346 $self->drawinfo ($color, $message);
1272} 1347}
1273 1348
1274sub conn::spell_add { 1349sub conn::spell_add {
1275 my ($self, $spell) = @_; 1350 my ($self, $spell) = @_;
1276 1351
… …
1289 1364
1290 for my $skill (values %{$self->{skill_info}}) { 1365 for my $skill (values %{$self->{skill_info}}) {
1291 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1366 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1292 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1367 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1293 } 1368 }
1369
1370 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1371 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1372 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1373 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1374}
1375
1376sub conn::eof {
1377 stop_game;
1294} 1378}
1295 1379
1296sub update_floorbox { 1380sub update_floorbox {
1297 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1381 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1382 return unless $CONN;
1383
1298 $FLOORBOX->clear; 1384 $FLOORBOX->clear;
1299 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1385 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1300 1386
1301 my @items = values %{ $CONN->{container}{0} }; 1387 my $count = 4;
1302 1388 for (@{ $CONN->{container}{0} }) {
1303 # we basically have to use the same sorting as everybody else 1389 if (--$count) {
1304 @items = sort { $a->{type} <=> $b->{type} } @items; 1390 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1305 1391 } else {
1306 for my $item (reverse @items) { 1392 $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 }, 1393 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 1394 }
1340 $hbox->add (new CFClient::UI::Label
1341 can_events => 0,
1342 text => $desc,
1343 );
1344 } 1395 }
1345 }); 1396 });
1346 refresh; 1397
1398 $WANT_REFRESH++;
1347} 1399}
1348 1400
1349sub conn::container_add { 1401sub conn::container_add {
1350 my ($self, $id, $items) = @_; 1402 my ($self, $tag, $items) = @_;
1351 1403
1352 update_floorbox if $id == 0; 1404 update_floorbox if $tag == 0;
1405
1406 $INV->set_items ($self->{container}{$self->{player}{tag}})
1407 if $tag == $self->{player}{tag};
1408
1353 # $self-<{player}{tag} => player inv 1409 # $self-<{player}{tag} => player inv
1354 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1410 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1355} 1411}
1356 1412
1357sub conn::container_clear { 1413sub conn::container_clear {
1358 my ($self, $id) = @_; 1414 my ($self, $tag) = @_;
1359 1415
1360 update_floorbox if $id == 0; 1416 update_floorbox if $tag == 0;
1417
1418 $INV->set_items ($self->{container}{$tag})
1419 if $tag == $self->{player}{tag};
1420
1361# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1421# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1362} 1422}
1363 1423
1364sub conn::item_delete { 1424sub conn::item_delete {
1365 my ($self, @items) = @_; 1425 my ($self, @items) = @_;
1366 1426
1367 for (@items) { 1427 for (@items) {
1368 update_floorbox if $_->{container} == 0; 1428 update_floorbox if $_->{container} == 0;
1429
1430 $INV->set_items ($self->{container}{$_->{container}})
1431 if $_->{container} == $self->{player}{tag};
1369 } 1432 }
1370} 1433}
1371 1434
1372sub conn::item_update { 1435sub conn::item_update {
1373 my ($self, $item) = @_; 1436 my ($self, $item) = @_;
1374 1437
1375 update_floorbox if $item->{container} == 0; 1438 update_floorbox if $item->{container} == 0;
1439
1440 $INV->set_items ($self->{container}{$item->{container}})
1441 if $item->{container} == $self->{player}{tag};
1376} 1442}
1377 1443
1378%SDL_CB = ( 1444%SDL_CB = (
1379 CFClient::SDL_QUIT => sub { 1445 CFClient::SDL_QUIT => sub {
1380 Event::unloop -1; 1446 Event::unloop -1;
1381 }, 1447 },
1382 CFClient::SDL_VIDEORESIZE => sub { 1448 CFClient::SDL_VIDEORESIZE => sub {
1383 }, 1449 },
1384 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1450 CFClient::SDL_VIDEOEXPOSE => sub {
1451 $WANT_REFRESH++;
1452 },
1385 CFClient::SDL_ACTIVEEVENT => sub { 1453 CFClient::SDL_ACTIVEEVENT => sub {
1386# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1454# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1387 }, 1455 },
1388 CFClient::SDL_KEYDOWN => sub { 1456 CFClient::SDL_KEYDOWN => sub {
1389 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1457 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1393 video_init; 1461 video_init;
1394 } else { 1462 } else {
1395 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1463 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1396 } 1464 }
1397 }, 1465 },
1398 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1466 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1399 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1467 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1400 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1468 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1401 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1469 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1402 CFClient::SDL_USEREVENT => \&audio_music_finished, 1470 CFClient::SDL_USEREVENT => sub {
1471 if ($_[0]{code} == 1) {
1472 audio_channel_finished $_[0]{data1};
1473 } elsif ($_[0]{code} == 0) {
1474 audio_music_finished;
1475 }
1476 },
1403); 1477);
1404 1478
1405############################################################################# 1479#############################################################################
1406 1480
1407$SIG{INT} = $SIG{TERM} = sub { exit }; 1481$SIG{INT} = $SIG{TERM} = sub { exit };
1408 1482
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{ 1483{
1484 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1485
1486 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1487
1488 $TILECACHE = CFClient::db_table "tilecache";
1489 $FACEMAP = CFClient::db_table "facemap";
1490
1491 my %DEF_CFG = (
1492 sdl_mode => 0,
1493 width => 640,
1494 height => 480,
1495 fullscreen => 0,
1496 fast => 0,
1497 map_scale => 0.5,
1498 fow_enable => 1,
1499 fow_intensity => 0.45,
1500 fow_smooth => 0,
1501 gui_fontsize => 1,
1502 log_fontsize => 1,
1503 gauge_fontsize=> 1,
1504 gauge_size => 0.35,
1505 stat_fontsize => 1,
1506 mapsize => 100,
1507 host => "crossfire.schmorp.de",
1508 say_command => 'say',
1509 audio_enable => 1,
1510 bgm_enable => 1,
1511 bgm_volume => 0.25,
1512 );
1513
1514 while (my ($k, $v) = each %DEF_CFG) {
1515 $CFG->{$k} = $v unless exists $CFG->{$k};
1516 }
1517
1518 sdl_init;
1519
1520 @SDL_MODES = reverse
1521 grep $_->[0] >= 640 && $_->[1] >= 480,
1522 CFClient::SDL_ListModes;
1523
1524 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1525
1526 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1527
1528 {
1452 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1529 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1453 DejaVuSans.ttf 1530 DejaVuSans.ttf
1454 DejaVuSansMono.ttf 1531 DejaVuSansMono.ttf
1455 DejaVuSans-Bold.ttf 1532 DejaVuSans-Bold.ttf
1456 DejaVuSansMono-Bold.ttf 1533 DejaVuSansMono-Bold.ttf
1457 DejaVuSans-Oblique.ttf 1534 DejaVuSans-Oblique.ttf
1458 DejaVuSansMono-Oblique.ttf 1535 DejaVuSansMono-Oblique.ttf
1459 DejaVuSans-BoldOblique.ttf 1536 DejaVuSans-BoldOblique.ttf
1460 DejaVuSansMono-BoldOblique.ttf 1537 DejaVuSansMono-BoldOblique.ttf
1461 ); 1538 );
1462 1539
1463 CFClient::add_font $_ for @fonts; 1540 CFClient::add_font $_ for @fonts;
1464 1541
1542 CFClient::pango_init;
1543
1465 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1544 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1466 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1545 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1467 1546
1468 $FONT_PROP->make_default; 1547 $FONT_PROP->make_default;
1469} 1548 }
1470 1549
1471video_init; 1550 video_init;
1472audio_init; 1551 audio_init;
1552}
1473 1553
1474Event::loop; 1554Event::loop;
1475 1555
1476END { CFClient::SDL_Quit } 1556END { CFClient::SDL_Quit }
1477 1557
… …
1507limits (like a fixed amount of face numbers). There are still limits, but 1587limits (like a fixed amount of face numbers). There are still limits, but
1508they are not arbitrarily low :) 1588they are not arbitrarily low :)
1509 1589
1510=back 1590=back
1511 1591
1592=head1 USAGE
1593
1594=head2 The Map
1595
1596The map is always displayed in the background, behind all other windows and UI elements.
1597
1598#TODO# middle-click scrolls
1599#
1600# keys:
1601#
1602# a apply
1603# keypad moves, kp_5 applies ranged attack to self
1604
1605Starting to type enters the I<completion mode>. In that mode, you can type
1606abbreviations or commands and have them executed as soon as they match a
1607valid command. This is best explained by a few examples:
1608
1609Typing B<climb> will display a list of commands with I<climb> in their
1610name, such as I<ready_skill climbing> and I<use_skill climbing>.
1611
1612You can abbreviate commands by typing only the first character of every
1613word. For example, typing I<iwor> will likely select I<invoke word of
1614recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1615will likely select I<ready_skill climbing> and I<usl> will give you
1616I<use_skill levitation>.
1617
1618=head2 The map overview
1619
1620#TODO#
1621
1622=head2 The Status area in the lower right corner
1623
1624#TODO#
1625
1626=head2 The I<Statistics>/I>Stats> window
1627
1628#TODO#
1629
1512=head1 FAQ 1630=head1 FAQ
1513 1631
1514=over 4 1632=over 4
1515 1633
1516=item The client is very sluggish and slow, what can I do about this? 1634=item The client is very sluggish and slow, what can I do about this?

Diff Legend

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