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

Diff Legend

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