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.179 by root, Tue Apr 25 09:52:05 2006 UTC vs.
Revision 1.221 by root, Wed May 17 01:03:10 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
… …
663 698
664 $METASERVER = metaserver_dialog; 699 $METASERVER = metaserver_dialog;
665 700
666 $vbox->add (new CFClient::UI::Flopper 701 $vbox->add (new CFClient::UI::Flopper
667 expand => 1, 702 expand => 1,
668 text => "Metaserver", 703 text => "Server List",
669 other => $METASERVER, 704 other => $METASERVER,
670 tooltip => "Show a list of avaible crossfire servers", 705 tooltip => "Show a list of available crossfire servers",
671 connect_open => sub { 706 connect_open => sub {
672 update_metaserver $HOST; 707 update_metaserver $HOST;
673 } 708 }
674 ); 709 );
675 } 710 }
… …
693 my ($self, $value) = @_; 728 my ($self, $value) = @_;
694 $CFG->{password} = $value; 729 $CFG->{password} = $value;
695 } 730 }
696 ); 731 );
697 732
698 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
699 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
700 text => $CFG->{say_command},
701 tooltip => "This is the command that will be used if you write a line in the message window entry. "
702 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
703 ."But you could also set it to 'tell <playername>' to only chat with that user.",
704 connect_changed => sub {
705 my ($self, $value) = @_;
706 $CFG->{say_command} = $value;
707 }
708 );
709
710 $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");
711 $table->add (1, 7, new CFClient::UI::Slider 734 $table->add (1, 7, new CFClient::UI::Slider
712 req_w => 100, 735 req_w => 100,
713 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 736 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
714 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. "
715 ."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.",
716 connect_changed => sub { 739 connect_changed => sub {
717 my ($self, $value) = @_; 740 my ($self, $value) = @_;
718 741
719 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 742 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
720 }, 743 },
721 ); 744 );
722 745
723 $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
724 start_game; 752 : start_game;
753 },
725 }); 754 );
726 755
727 $dialog 756 $dialog
728} 757}
729 758
730sub message_window { 759sub message_window {
731 my $window = new CFClient::UI::FancyFrame 760 my $window = new CFClient::UI::FancyFrame
732 title => "Messages", 761 title => "Messages",
733 border_bg => [1, 1, 1, 0.5], 762 border_bg => [1, 1, 1, 1],
734 bg => [0.3, 0.3, 0.3, 0.8], 763 bg => [0, 0, 0, 0.5],
735 user_w => int $::WIDTH / 3, 764 user_w => int $::WIDTH / 3,
736 user_h => int $::HEIGHT / 5, 765 user_h => int $::HEIGHT / 5,
737 child => (my $vbox = new CFClient::UI::VBox); 766 child => (my $vbox = new CFClient::UI::VBox);
738 767
739 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 768 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
779 }; 808 };
780 809
781 $window 810 $window
782} 811}
783 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
784sub sdl_init { 824sub sdl_init {
785 CFClient::SDL_Init 825 CFClient::SDL_Init
786 and die "SDL::Init failed!\n"; 826 and die "SDL::Init failed!\n";
787} 827}
788 828
789sub video_init { 829sub video_init {
790 sdl_init; 830 sdl_init;
791 831
832 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
833
792 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 834 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
793 $FULLSCREEN = $CFG->{fullscreen}; 835 $FULLSCREEN = $CFG->{fullscreen};
794 $FAST = $CFG->{fast}; 836 $FAST = $CFG->{fast};
795 837
796 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 838 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
797 or die "SDL_SetVideoMode failed!\n"; 839 or die "SDL_SetVideoMode failed!\n";
798 840
799 $SDL_ACTIVE = 1; 841 $SDL_ACTIVE = 1;
800
801 $LAST_REFRESH = time - 0.01; 842 $LAST_REFRESH = time - 0.01;
802 843
803 CFClient::gl_init; 844 CFClient::gl_init;
804 845
805 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 846 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
806 847
848 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
849
807 ############################################################################# 850 #############################################################################
808 851
852 unless ($DEBUG_STATUS) {
853 # create the widgets
854
809 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 855 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
810 $DEBUG_STATUS->show; 856 $DEBUG_STATUS->show;
811 857
812 $STATUS_LINE = new CFClient::UI::Label 858 $STATUSBOX = new CFClient::UI::Statusbox;
813 padding => 0, 859 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
814 y => $HEIGHT - $FONTSIZE * 1.8;
815 $STATUS_LINE->show;
816 860
817 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 861 (new CFClient::UI::Frame
818 padding => 0, 862 bg => [0, 0, 0, 0.4],
819 fontsize => 0.8, 863 req_y => -1,
820 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 864 child => $STATUSBOX,
821 $ALT_ENTER_MESSAGE->show; 865 )->show;
822 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
823 866
824 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 867 CFClient::UI::FancyFrame->new (
825 $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;
826 $MAPWIDGET->connect (activate_console => sub { 874 $MAPWIDGET->connect (activate_console => sub {
827 my ($mapwidget, $preset) = @_; 875 my ($mapwidget, $preset) = @_;
828 876
829 if ($CONSOLE) { 877 if ($CONSOLE) {
830 $CONSOLE->{input}->{auto_activated} = 1; 878 $CONSOLE->{input}->{auto_activated} = 1;
831 $CONSOLE->{input}->focus_in; 879 $CONSOLE->{input}->focus_in;
832 880
833 if ($preset && $CONSOLE->{input}->get_text eq '') { 881 if ($preset && $CONSOLE->{input}->get_text eq '') {
834 $CONSOLE->{input}->set_text ($preset); 882 $CONSOLE->{input}->set_text ($preset);
883 }
835 } 884 }
836 } 885 });
837 }); 886 $MAPWIDGET->show;
887 $MAPWIDGET->focus_in;
838 888
839 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 889 $BUTTONBAR = new CFClient::UI::HBox;
840 890
841 $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);
842 $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);
843 $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);
844 894
845 $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
846 $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);
847 899
848 $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 {
849 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 901 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
850 status "Configuration Saved"; 902 status "Configuration Saved";
851 }); 903 });
852 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 {
853 $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 }
854} 917}
855 918
856sub video_shutdown { 919sub video_shutdown {
857 $CFClient::UI::ROOT->{children} = [];
858 undef $CFClient::UI::GRAB;
859 undef $CFClient::UI::HOVER;
860 undef $SDL_ACTIVE; 920 undef $SDL_ACTIVE;
861} 921}
862 922
863my @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#
864my $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}
865 931
866sub audio_music_finished { 932sub audio_music_finished {
867 return unless $CFG->{bgm_enable}; 933 return unless $CFG->{bgm_enable};
868 934
869 # TODO: hack, do play loop and mood music 935 # TODO: hack, do play loop and mood music
… …
873 push @bgmusic, shift @bgmusic; 939 push @bgmusic, shift @bgmusic;
874} 940}
875 941
876sub audio_init { 942sub audio_init {
877 if ($CFG->{audio_enable}) { 943 if ($CFG->{audio_enable}) {
878 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 944 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
879 $SDL_MIXER = !CFClient::Mix_OpenAudio; 945 $SDL_MIXER = !CFClient::Mix_OpenAudio;
880 CFClient::Mix_AllocateChannels 8; 946 CFClient::Mix_AllocateChannels 8;
881 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 947 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
882 948
883 audio_music_finished; 949 audio_music_finished;
… …
910} 976}
911 977
912my %animate_object; 978my %animate_object;
913my $animate_timer; 979my $animate_timer;
914 980
915my $want_refresh;
916my $can_refresh;
917
918my $fps = 9; 981my $fps = 9;
919 982
920sub force_refresh { 983sub force_refresh {
921 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 984 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
922 debug sprintf "%3.2f", $fps; 985 debug sprintf "%3.2f", $fps;
923 986
924 $want_refresh = 0;
925 $can_refresh = 0;
926
927 $CFClient::UI::ROOT->draw; 987 $CFClient::UI::ROOT->draw;
928
929 CFClient::SDL_GL_SwapBuffers; 988 CFClient::SDL_GL_SwapBuffers;
930 989
990 $WANT_REFRESH = 0;
991 $CAN_REFRESH = 0;
931 $LAST_REFRESH = $NOW; 992 $LAST_REFRESH = $NOW;
932} 993}
933 994
934my $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 {
935 $NOW = time; 996 $NOW = time;
… …
937 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 998 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
938 for CFClient::SDL_PollEvent; 999 for CFClient::SDL_PollEvent;
939 1000
940 if (%animate_object) { 1001 if (%animate_object) {
941 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1002 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
942 $want_refresh++; 1003 $WANT_REFRESH++;
943 } 1004 }
944 1005
945 if ($want_refresh) { 1006 if ($WANT_REFRESH) {
946 force_refresh; 1007 force_refresh;
947 } else { 1008 } else {
948 $can_refresh = 1; 1009 $CAN_REFRESH = 1;
949 } 1010 }
950}); 1011});
951
952sub refresh {
953 $want_refresh++;
954}
955 1012
956sub animation_start { 1013sub animation_start {
957 my ($widget) = @_; 1014 my ($widget) = @_;
958 $animate_object{$widget} = $widget; 1015 $animate_object{$widget} = $widget;
959} 1016}
… …
1038# at worst. 1095# at worst.
1039sub conn::flood_fill { 1096sub conn::flood_fill {
1040 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1097 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1041 1098
1042 # the server does not allow map paths > 6 1099 # the server does not allow map paths > 6
1043 return if 6 <= length $path; 1100 return if 7 <= length $path;
1044 1101
1045 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1102 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1046 1103
1047 for ( 1104 for (
1048 [1, 0, -1], 1105 [1, 0, -1],
… …
1091 1148
1092 $self->flush_map; 1149 $self->flush_map;
1093 1150
1094 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1151 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1095 1152
1096 my $mapmapw = 250; 1153 my $mapmapw = $MAPMAP->{w};
1097 my $mapmaph = 250; 1154 my $mapmaph = $MAPMAP->{h};
1098 1155
1099 $self->{neigh_rect} = [ 1156 $self->{neigh_rect} = [
1100 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1157 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1101 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1158 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1102 ]; 1159 ];
… …
1271 [0.55, 0.41, 0.13], 1328 [0.55, 0.41, 0.13],
1272 [0.99, 0.77, 0.26], 1329 [0.99, 0.77, 0.26],
1273 [0.74, 0.65, 0.41], 1330 [0.74, 0.65, 0.41],
1274 ); 1331 );
1275 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
1276 $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);
1277} 1354}
1278 1355
1279sub conn::spell_add { 1356sub conn::spell_add {
1280 my ($self, $spell) = @_; 1357 my ($self, $spell) = @_;
1281 1358
… …
1290} 1367}
1291 1368
1292sub conn::addme_success { 1369sub conn::addme_success {
1293 my ($self) = @_; 1370 my ($self) = @_;
1294 1371
1372 $MAPWIDGET->clr_commands;
1373
1295 for my $skill (values %{$self->{skill_info}}) { 1374 for my $skill (values %{$self->{skill_info}}) {
1296 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1375 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1297 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1376 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1298 } 1377 }
1378
1379 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
1380 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
1381 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1382 $MAPWIDGET->add_command ("killpets", "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 body
1392 bowmode
1393 brace
1394 build
1395 disarm
1396 dm
1397 dmhide
1398 drop
1399 dropall
1400 examine
1401 get
1402 gsay
1403 help
1404 hiscore
1405 inventory
1406 invoke
1407 killpets
1408 listen
1409 logs
1410 mapinfo
1411 maps
1412 mark
1413 motd
1414 output-count
1415 output-sync
1416 party
1417 peaceful
1418 petmode
1419 pickup
1420 players
1421 prepare
1422 quests
1423 rename
1424 resistances
1425 rotateshoottype
1426 save
1427 say
1428 search
1429 search-items
1430 showpets
1431 skills
1432 sound
1433 take
1434 throw
1435 time
1436 title
1437 usekeys
1438 version
1439 weather
1440 whereabouts
1441 whereami
1442 who
1443 wimpy
1444 )) {
1445 $MAPWIDGET->add_command ($_, "$_: no help available (yet)");
1446 }
1447
1448 #TODO: add " and ' "aliases" etc.
1449}
1450
1451sub conn::eof {
1452 $MAPWIDGET->clr_commands;
1453
1454 stop_game;
1299} 1455}
1300 1456
1301sub update_floorbox { 1457sub update_floorbox {
1302 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1458 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1459 return unless $CONN;
1460
1303 $FLOORBOX->clear; 1461 $FLOORBOX->clear;
1304 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1462 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1305 1463
1306 my @items = values %{ $CONN->{container}{0} }; 1464 my $count = 4;
1307 1465 for (@{ $CONN->{container}{0} }) {
1308 # we basically have to use the same sorting as everybody else 1466 if (--$count) {
1309 @items = sort { $a->{type} <=> $b->{type} } @items; 1467 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1310 1468 } else {
1311 for my $item (reverse @items) { 1469 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1312 my $desc = $item->{nrof} < 2
1313 ? $item->{name}
1314 : "$item->{nrof} $item->{name_pl}";
1315 # todo: animation widget, face widget, weight(?) etc.
1316 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1317 tooltip => (CFClient::UI::Label->escape ($desc)
1318 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1319 can_hover => 1,
1320 can_events => 1,
1321 connect_button_down => sub {
1322 my ($self, $ev, $x, $y) = @_;
1323
1324 # todo: maybe put examine on 1? but should just be a tooltip :(
1325 if ($ev->{button} == 1) {
1326 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1327 } elsif ($ev->{button} == 2) {
1328 $CONN->send ("apply $item->{tag}");
1329 } elsif ($ev->{button} == 3) {
1330 # examine, lock, mark, maybe other things
1331 warn "MENU not implemented yet\n";
1332 }
1333
1334 1
1335 }, 1470 last;
1336 );
1337
1338 $hbox->add (new CFClient::UI::Face
1339 can_events => 0,
1340 face => $item->{face},
1341 anim => $item->{anim},
1342 animspeed => $item->{animspeed},
1343 );
1344 1471 }
1345 $hbox->add (new CFClient::UI::Label
1346 can_events => 0,
1347 text => $desc,
1348 );
1349 } 1472 }
1350 }); 1473 });
1351 refresh; 1474
1475 $WANT_REFRESH++;
1352} 1476}
1353 1477
1354sub conn::container_add { 1478sub conn::container_add {
1355 my ($self, $id, $items) = @_; 1479 my ($self, $tag, $items) = @_;
1356 1480
1357 update_floorbox if $id == 0; 1481 if ($tag == 0) {
1482 update_floorbox;
1483 $INVR->set_items ($self->{container}{0});
1484 $OPENCONT = 0;
1485 } elsif ($tag == $self->{player}{tag}) {
1486 $INV->set_items ($self->{container}{$self->{player}{tag}})
1487 } else {
1488 $OPENCONT = $tag;
1489 $INVR->set_items ($self->{container}{$tag});
1490 }
1491
1358 # $self-<{player}{tag} => player inv 1492 # $self-<{player}{tag} => player inv
1359 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1493 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1360} 1494}
1361 1495
1362sub conn::container_clear { 1496sub conn::container_clear {
1363 my ($self, $id) = @_; 1497 my ($self, $tag) = @_;
1364 1498
1365 update_floorbox if $id == 0; 1499 if ($tag == 0) {
1500 update_floorbox;
1501 $INVR->set_items ($self->{container}{0});
1502 $OPENCONT = 0;
1503 } elsif ($tag == $self->{player}{tag}) {
1504 $INV->set_items ($self->{container}{$tag})
1505 } else {
1506 $INVR->set_items ($self->{container}{$tag});
1507 $OPENCONT = $tag;
1508 }
1509
1366# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1510# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1367} 1511}
1368 1512
1369sub conn::item_delete { 1513sub conn::item_delete {
1370 my ($self, @items) = @_; 1514 my ($self, @items) = @_;
1371 1515
1372 for (@items) { 1516 for (@items) {
1373 update_floorbox if $_->{container} == 0; 1517 if ($_->{container} == 0) {
1518 update_floorbox;
1519 $INVR->set_items ($self->{container}{0});
1520 } elsif ($_->{container} == $self->{player}{tag}) {
1521 $INV->set_items ($self->{container}{$self->{player}{tag}})
1522 } else {
1523 $INVR->set_items ($self->{container}{0});
1524 }
1374 } 1525 }
1375} 1526}
1376 1527
1377sub conn::item_update { 1528sub conn::item_update {
1378 my ($self, $item) = @_; 1529 my ($self, $item) = @_;
1379 1530
1380 update_floorbox if $item->{container} == 0; 1531 if ($item->{container} == 0) {
1532 update_floorbox;
1533 $INVR->set_items ($self->{container}{0});
1534 } elsif ($item->{container} == $self->{player}{tag}) {
1535 $INV->set_items ($self->{container}{$item->{container}})
1536 }
1381} 1537}
1382 1538
1383%SDL_CB = ( 1539%SDL_CB = (
1384 CFClient::SDL_QUIT => sub { 1540 CFClient::SDL_QUIT => sub {
1385 Event::unloop -1; 1541 Event::unloop -1;
1386 }, 1542 },
1387 CFClient::SDL_VIDEORESIZE => sub { 1543 CFClient::SDL_VIDEORESIZE => sub {
1388 }, 1544 },
1389 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1545 CFClient::SDL_VIDEOEXPOSE => sub {
1546 $WANT_REFRESH++;
1547 },
1390 CFClient::SDL_ACTIVEEVENT => sub { 1548 CFClient::SDL_ACTIVEEVENT => sub {
1391# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1549# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1392 }, 1550 },
1393 CFClient::SDL_KEYDOWN => sub { 1551 CFClient::SDL_KEYDOWN => sub {
1394 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1552 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1398 video_init; 1556 video_init;
1399 } else { 1557 } else {
1400 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1558 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1401 } 1559 }
1402 }, 1560 },
1403 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1561 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1404 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1562 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1405 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1563 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1406 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1564 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1407 CFClient::SDL_USEREVENT => \&audio_music_finished, 1565 CFClient::SDL_USEREVENT => sub {
1566 if ($_[0]{code} == 1) {
1567 audio_channel_finished $_[0]{data1};
1568 } elsif ($_[0]{code} == 0) {
1569 audio_music_finished;
1570 }
1571 },
1408); 1572);
1409 1573
1410############################################################################# 1574#############################################################################
1411 1575
1412$SIG{INT} = $SIG{TERM} = sub { exit }; 1576$SIG{INT} = $SIG{TERM} = sub { exit };
1413 1577
1414$TILECACHE = CFClient::db_table "tilecache";
1415$FACEMAP = CFClient::db_table "facemap";
1416
1417CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1418
1419my %DEF_CFG = (
1420 sdl_mode => 0,
1421 width => 640,
1422 height => 480,
1423 fullscreen => 0,
1424 fast => 0,
1425 map_scale => 0.5,
1426 fow_enable => 1,
1427 fow_intensity => 0.45,
1428 fow_smooth => 0,
1429 gui_fontsize => 1,
1430 log_fontsize => 1,
1431 gauge_fontsize => 1,
1432 gauge_size => 0.35,
1433 stat_fontsize => 1,
1434 mapsize => 100,
1435 host => "crossfire.schmorp.de",
1436 say_command => 'say',
1437 audio_enable => 1,
1438 bgm_enable => 1,
1439 bgm_volume => 0.25,
1440);
1441
1442while (my ($k, $v) = each %DEF_CFG) {
1443 $CFG->{$k} = $v unless exists $CFG->{$k};
1444}
1445
1446sdl_init;
1447
1448@SDL_MODES = reverse
1449 grep $_->[0] >= 640 && $_->[1] >= 480,
1450 CFClient::SDL_ListModes;
1451
1452@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1453
1454$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1455
1456{ 1578{
1579 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1580
1581 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1582
1583 $TILECACHE = CFClient::db_table "tilecache";
1584 $FACEMAP = CFClient::db_table "facemap";
1585
1586 my %DEF_CFG = (
1587 sdl_mode => 0,
1588 width => 640,
1589 height => 480,
1590 fullscreen => 0,
1591 fast => 0,
1592 map_scale => 0.5,
1593 fow_enable => 1,
1594 fow_intensity => 0.45,
1595 fow_smooth => 0,
1596 gui_fontsize => 1,
1597 log_fontsize => 1,
1598 gauge_fontsize=> 1,
1599 gauge_size => 0.35,
1600 stat_fontsize => 1,
1601 mapsize => 100,
1602 host => "crossfire.schmorp.de",
1603 say_command => 'say',
1604 audio_enable => 1,
1605 bgm_enable => 1,
1606 bgm_volume => 0.25,
1607 );
1608
1609 while (my ($k, $v) = each %DEF_CFG) {
1610 $CFG->{$k} = $v unless exists $CFG->{$k};
1611 }
1612
1613 sdl_init;
1614
1615 @SDL_MODES = reverse
1616 grep $_->[0] >= 640 && $_->[1] >= 480,
1617 CFClient::SDL_ListModes;
1618
1619 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1620
1621 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1622
1623 {
1457 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1624 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1458 DejaVuSans.ttf 1625 DejaVuSans.ttf
1459 DejaVuSansMono.ttf 1626 DejaVuSansMono.ttf
1460 DejaVuSans-Bold.ttf 1627 DejaVuSans-Bold.ttf
1461 DejaVuSansMono-Bold.ttf 1628 DejaVuSansMono-Bold.ttf
1462 DejaVuSans-Oblique.ttf 1629 DejaVuSans-Oblique.ttf
1463 DejaVuSansMono-Oblique.ttf 1630 DejaVuSansMono-Oblique.ttf
1464 DejaVuSans-BoldOblique.ttf 1631 DejaVuSans-BoldOblique.ttf
1465 DejaVuSansMono-BoldOblique.ttf 1632 DejaVuSansMono-BoldOblique.ttf
1466 ); 1633 );
1467 1634
1468 CFClient::add_font $_ for @fonts; 1635 CFClient::add_font $_ for @fonts;
1469 1636
1637 CFClient::pango_init;
1638
1470 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1639 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1471 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1640 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1472 1641
1473 $FONT_PROP->make_default; 1642 $FONT_PROP->make_default;
1474} 1643 }
1475 1644
1645# compare mono (ft) vs. rgba (cairo)
1646# ft - 1.8s, cairo 3s, even in alpha-only mode
1647# for my $rgba (0..1) {
1648# my $t1 = Time::HiRes::time;
1649# for (1..1000) {
1650# my $layout = CFClient::Layout->new ($rgba);
1651# $layout->set_text ("hallo" x 100);
1652# $layout->render;
1653# }
1654# my $t2 = Time::HiRes::time;
1655# warn $t2-$t1;
1656# }
1657
1476video_init; 1658 video_init;
1477audio_init; 1659 audio_init;
1660}
1478 1661
1479Event::loop; 1662Event::loop;
1480 1663
1481END { CFClient::SDL_Quit } 1664END { CFClient::SDL_Quit }
1482 1665

Diff Legend

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