[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/pclient

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.154 by elmex, Thu Apr 20 16:29:40 2006 UTC vs.
Revision 1.171 by root, Mon Apr 24 03:33:51 2006 UTC

…		…
36	our @SDL_MODES;	36	our @SDL_MODES;
37	our $WIDTH;	37	our $WIDTH;
38	our $HEIGHT;	38	our $HEIGHT;
39	our $FULLSCREEN;	39	our $FULLSCREEN;
40	our $FONTSIZE;	40	our $FONTSIZE;
		41
		42	our $FONT_PROP;
		43	our $FONT_FIXED;
41		44
42	our $MAP;	45	our $MAP;
43	our $MAPWIDGET;	46	our $MAPWIDGET;
44	our $BUTTONBAR;	47	our $BUTTONBAR;
45	our $LOGVIEW;	48	our $LOGVIEW;
…		…
117	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	120	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
118	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	121	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
119	});	122	});
120	$mode_slider->emit (changed => $mode_slider->{range}[0]);	123	$mode_slider->emit (changed => $mode_slider->{range}[0]);
121		124
		125	my $row = 1;
		126
122	$table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	127	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
123	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	128	$table->add (1, $row++, new CFClient::UI::CheckBox
		129	state => $CFG->{fullscreen},
		130	tooltip => "Bring the client into fullscreen mode",
		131	connect_changed => sub {
124	my ($self, $value) = @_;	132	my ($self, $value) = @_;
125	$CFG->{fullscreen} = $value;	133	$CFG->{fullscreen} = $value;
		134	}
126	});	135	);
127		136
128	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	137	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
129	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	138	$table->add (1, $row++, new CFClient::UI::CheckBox
		139	state => $CFG->{fast},
		140	tooltip => "Lower the visual quality considerably to speed up rendering.",
		141	connect_changed => sub {
130	my ($self, $value) = @_;	142	my ($self, $value) = @_;
131	$CFG->{fast} = $value;	143	$CFG->{fast} = $value;
		144	}
132	});	145	);
133		146
		147	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
		148	$table->add (1, $row++, new CFClient::UI::Slider
		149	range => [$CFG->{map_scale}, 0.25, 2, 0.05],
		150	tooltip => "Enlarge or shrink the displayed map",
		151	connect_changed => sub {
		152	my ($self, $value) = @_;
		153	$CFG->{map_scale} = 0.05 * int $value / 0.05;
		154	}
		155	);
		156
134	$table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	157	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
135	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {	158	$table->add (1, $row++, new CFClient::UI::CheckBox
		159	state => $CFG->{fow_enable},
		160	tooltip => "Fog-of-War marks areas that cannot be seen by the player",
		161	connect_changed => sub {
136	my ($self, $value) = @_;	162	my ($self, $value) = @_;
137	$CFG->{fow_enable} = $value;	163	$CFG->{fow_enable} = $value;
		164	}
138	});	165	);
139		166
140	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	167	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
141	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	168	$table->add (1, $row++, new CFClient::UI::Slider
		169	range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
		170	tooltip => "The higher the intensity, the lighter the Fog-of-War color",
		171	connect_changed => sub {
142	my ($self, $value) = @_;	172	my ($self, $value) = @_;
143	$CFG->{fow_intensity} = $value;	173	$CFG->{fow_intensity} = $value;
		174	}
144	});	175	);
145		176
146	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	177	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
147	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	178	$table->add (1, $row++, new CFClient::UI::CheckBox
		179	state => $CFG->{fow_smooth},
		180	tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
		181	connect_changed => sub {
148	my ($self, $value) = @_;	182	my ($self, $value) = @_;
149	$CFG->{fow_smooth} = $value;	183	$CFG->{fow_smooth} = $value;
150	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	184	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
		185	}
151	});	186	);
152		187
153	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	188	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
154	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	189	$table->add (1, $row++, new CFClient::UI::Slider
		190	range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
		191	tooltip => "The font size used by most GUI elements",
		192	connect_changed => sub {
155	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;	193	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
156	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	194	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		195	}
157	});	196	);
158		197
159	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");	198	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
160	$table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	199	$table->add (1, $row++, new CFClient::UI::Slider
		200	range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
		201	tooltip => "The font size used by the server log window only",
		202	connect_changed => sub {
161	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);	203	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
		204	}
162	});	205	);
163		206
164	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	207	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		208
		209	$table->add (1, $row++, new CFClient::UI::Slider
		210	range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
		211	tooltip => "The font size used by the statistics window only",
		212	connect_changed => sub {
		213	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
		214	&set_stats_window_fontsize;
		215	}
		216	);
		217
		218	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
		219	$table->add (1, $row++, new CFClient::UI::Slider
		220	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
		221	tooltip => "Adjust the size of the stats gauges at the bottom right",
		222	connect_changed => sub {
		223	$CFG->{gauge_size} = $_[1];
		224	my $h = int $HEIGHT * $CFG->{gauge_size};
		225	$GAUGES->{win}->set_size ($WIDTH, $h);
		226	$GAUGES->{win}->move (0, $HEIGHT - $h);
		227	}
		228	);
		229
		230	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
		231	$table->add (1, $row++, new CFClient::UI::Slider
		232	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
		233	tooltip => "Adjusts the fontsize of the gauges at the bottom right",
		234	connect_changed => sub {
		235	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
		236	&set_gauge_window_fontsize;
		237	}
		238	);
		239
		240	$table->add (1, $row++, new CFClient::UI::Button
		241	expand => 1, align => 0, text => "Apply",
		242	tooltip => "Apply the video settings",
		243	connect_activate => sub {
165	video_shutdown ();	244	video_shutdown ();
166	video_init ();	245	video_init ();
		246	}
167	});	247	);
168		248
169	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	249	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
170	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {	250	$table->add (1, $row++, new CFClient::UI::CheckBox
		251	state => $CFG->{audio_enable},
		252	tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
		253	connect_changed => sub {
171	$CFG->{audio_enable} = $_[1];	254	$CFG->{audio_enable} = $_[1];
		255	}
172	});	256	);
173	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	257	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
174	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	258	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
175	# $CFG->{effects_volume} = $_[1];	259	# $CFG->{effects_volume} = $_[1];
176	# });	260	# });
177	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	261	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
178	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);	262	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
179	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {	263	$hbox->add (new CFClient::UI::CheckBox
		264	expand => 1, state => $CFG->{bgm_enable},
		265	tooltip => "Enable background music playing",
		266	connect_changed => sub {
180	$CFG->{bgm_enable} = $_[1];	267	$CFG->{bgm_enable} = $_[1];
		268	}
181	});	269	);
182	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {	270	$hbox->add (new CFClient::UI::Slider
		271	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
		272	tooltip => "The volume of the background music",
		273	connect_changed => sub {
183	$CFG->{bgm_volume} = $_[1];	274	$CFG->{bgm_volume} = $_[1];
184	CFClient::MixMusic::volume $_[1] * 128;	275	CFClient::MixMusic::volume $_[1] * 128;
		276	}
185	});	277	);
186		278
187	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	279	$table->add (1, $row++, new CFClient::UI::Button
		280	expand => 1, align => 0, text => "Apply",
		281	tooltip => "Apply the audio settings",
		282	connect_activate => sub {
188	audio_shutdown ();	283	audio_shutdown ();
189	audio_init ();	284	audio_init ();
		285	}
190	});	286	);
191		287
192	$dialog	288	$dialog
193	}	289	}
194		290
		291	sub set_stats_window_fontsize {
		292	for (values %{$STATWIDS}) {
		293	$_->set_fontsize ($::CFG->{stat_fontsize});
		294	}
		295	}
		296
		297	sub set_gauge_window_fontsize {
		298	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
		299	$_->set_fontsize ($::CFG->{gauge_fontsize});
		300	}
		301
		302	# local $GAUGES->{win}{parent};#d#
		303	# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
		304	}
		305
		306	sub make_gauge_window {
		307	my $gh = int ($HEIGHT * $CFG->{gauge_size});
		308	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
		309
		310	my $win = new CFClient::UI::Frame (
		311	y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
		312	);
		313	$win->add (my $vb = new CFClient::UI::VBox);
		314
		315	$vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
		316
		317	$hbg->add (new CFClient::UI::Empty expand => 1);
		318	$hbg->add (my $hb = new CFClient::UI::HBox);
		319	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
		320	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
		321	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
		322	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
		323
		324	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
		325	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
		326
		327	$GAUGES = {
		328	exp => $exp, win => $win, range => $rng,
		329	food => $fg, mana => $mg, hp => $hg, grace => $gg
		330	};
		331
		332	&set_gauge_window_fontsize;
		333
		334	$win
		335	}
		336
195	sub make_stats_window {	337	sub make_stats_window {
196	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/3, y => 0, title => "Stats");	338	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		339
197	$tgw->add (my $vb = new CFClient::UI::VBox ());	340	$tgw->add (my $vb = new CFClient::UI::VBox);
		341	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
198	$vb->add ($STATWIDS->{stat} = new CFClient::UI::Label valign => 0, align => -1);	342	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		343
199	$vb->add (my $hb2 = new CFClient::UI::HBox);	344	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		345
200	$hb2->add (my $hg = new CFClient::UI::Gauge (type => 'hp'));	346	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
201	$hb2->add (my $mg = new CFClient::UI::Gauge (type => 'mana'));	347
202	$hb2->add (my $gg = new CFClient::UI::Gauge (type => 'grace'));	348	$tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
203	$hb2->add (my $fg = new CFClient::UI::Gauge (type => 'food'));	349	$tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
204	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };	350	$tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		351	$tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		352	$tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		353	$tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		354	$tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		355
		356	$tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Str");
		357	$tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dex");
		358	$tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Con");
		359	$tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Int");
		360	$tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wis");
		361	$tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Pow");
		362	$tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Cha");
		363
		364	$tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
		365	$tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
		366	$tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
		367	$tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
		368	$tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
		369	$tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
		370
		371	$tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
		372	$tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
		373	$tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
		374	$tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
		375	$tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
		376	$tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
		377
		378	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
		379
		380	my $row = 0;
		381	my $col = 0;
		382
		383	my %resist_names = (
		384	slow => "Slow",
		385	holyw => "Holy Word",
		386	conf => "Confusion",
		387	fire => "Fire",
		388	depl => "Depletion",
		389	magic => "Magic",
		390	drain => "Draining",
		391	acid => "Acid",
		392	pois => "Poison",
		393	para => "Paralysation",
		394	deat => "Death",
		395	phys => "Physical",
		396	blind => "Blind",
		397	fear => "Fear",
		398	tund => "Turn undead",
		399	elec => "Electricity",
		400	cold => "Cold",
		401	ghit => "Ghost hit",
		402	);
		403	for (qw/slow holyw conf fire depl magic
		404	drain acid pois para deat phys
		405	blind fear tund elec cold ghit/)
		406	{
		407	$tbl2->add ($col, $row,
		408	$STATWIDS->{"res_$_"} =
		409	new CFClient::UI::Label
		410	template => "-100%",
		411	align => +1,
		412	valign => 0,
		413	tooltip => $resist_names{$_}
		414	);
		415	$tbl2->add ($col + 1, $row, new CFClient::UI::Image
		416	can_hover => 1,
		417	can_events => 1,
		418	image => "ui/resist/resist_$_.png",
		419	tooltip => $resist_names{$_}
		420	);
		421
		422	$row++;
		423	if ($row % 6 == 0) {
		424	$col += 2;
		425	$row = 0;
		426	}
		427	}
		428
		429	&set_stats_window_fontsize;
		430	update_stats_window ({});
		431
205	$tgw	432	$tgw
		433	}
		434
		435	sub formsep {
		436	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
206	}	437	}
207		438
208	sub update_stats_window {	439	sub update_stats_window {
209	my ($stats) = @_;	440	my ($stats) = @_;
210		441
211	$STATWIDS->{stat}->set_text (	442	# i love text protocols!!!
212	"Title: $stats->{21}\nExp.: " . ($stats->{11} \|\| $stats->{28})	443	my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
213	. " Level: $stats->{12}\n"	444	my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
214	. (sprintf "S%d D%d Co%d I%d W%d P%d Ch%2d, Wc%d Ac%d\n",	445	my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
215	@$stats{5,8,9,6,7,22,10, 13, 14})	446	my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
216	. (sprintf "Dam %d Arm %d Speed %.2f/%.2f",	447	my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
217	@$stats{15,16,17,19})	448	my $fo_m = 999;
		449	my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
		450	my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
		451
		452	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		453	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		454	$GAUGES->{food} ->set_value ($fo, $fo_m);
		455	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		456	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
		457	. " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
		458	my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
		459	$rng =~ s/^Range: //; # thank you so much dear server
		460	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		461	my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
		462	$title =~ s/^Player: //;
		463	$STATWIDS->{title} ->set_text ("Title: " . $title);
		464
		465	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		466	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		467	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		468	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		469	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		470	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		471	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		472	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		473	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		474	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		475	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		476	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
		477	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
		478
		479	my %tbl = (
		480	phys => 100,
		481	magic => 101,
		482	fire => 102,
		483	elec => 103,
		484	cold => 104,
		485	conf => 105,
		486	acid => 106,
		487	drain => 107,
		488	ghit => 108,
		489	pois => 109,
		490	slow => 110,
		491	para => 111,
		492	tund => 112,
		493	fear => 113,
		494	depl => 113,
		495	deat => 115,
		496	holyw => 116,
		497	blind => 117
218	);	498	);
		499
		500	for (keys %tbl) {
		501	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		502	}
		503
219	}	504	}
220		505
221	sub metaserver_dialog {	506	sub metaserver_dialog {
222	my $dialog = new CFClient::UI::FancyFrame	507	my $dialog = new CFClient::UI::FancyFrame
223	title => "Metaserver",	508	title => "Metaserver",
…		…
303	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	588	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
304		589
305	{	590	{
306	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	591	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
307		592
308	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {	593	$vbox->add (
		594	my $HOST = new CFClient::UI::Entry
		595	expand => 1,
		596	text => $CFG->{host},
		597	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
		598	connect_changed => sub {
		599	my ($self, $value) = @_;
		600	$CFG->{host} = $value;
		601	}
		602	);
		603
		604	$METASERVER = metaserver_dialog;
		605
		606	$vbox->add (new CFClient::UI::Flopper
		607	expand => 1,
		608	text => "Metaserver",
		609	other => $METASERVER,
		610	tooltip => "Show a list of avaible crossfire servers",
		611	connect_open => sub {
		612	update_metaserver $HOST;
		613	}
		614	);
		615	}
		616
		617	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
		618	$table->add (1, 4, new CFClient::UI::Entry
		619	text => $CFG->{user},
		620	tooltip => "The name of your character on the server",
		621	connect_changed => sub {
309	my ($self, $value) = @_;	622	my ($self, $value) = @_;
310	$CFG->{host} = $value;
311	});
312
313	$METASERVER = metaserver_dialog;
314
315	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
316	update_metaserver $HOST;
317	});
318	}
319
320	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
321	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
322	my ($self, $value) = @_;
323	$CFG->{user} = $value;	623	$CFG->{user} = $value;
		624	}
324	});	625	);
325		626
326	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	627	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
327	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	628	$table->add (1, 5, new CFClient::UI::Entry
		629	text => $CFG->{password},
		630	hidden => 1,
		631	tooltip => "The password for your character",
		632	connect_changed => sub {
328	my ($self, $value) = @_;	633	my ($self, $value) = @_;
329	$CFG->{password} = $value;	634	$CFG->{password} = $value;
		635	}
330	});	636	);
331		637
332	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");	638	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
333	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {	639	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry
		640	text => $CFG->{say_command},
		641	tooltip => "This is the command that will be used if you write a line in the message window entry. "
		642	."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		643	."But you could also set it to 'tell <playername>' to only chat with that user.",
		644	connect_changed => sub {
334	my ($self, $value) = @_;	645	my ($self, $value) = @_;
335	$CFG->{say_command} = $value;	646	$CFG->{say_command} = $value;
		647	}
336	});	648	);
337		649
338	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	650	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
339	$table->add (1, 7, new CFClient::UI::Slider	651	$table->add (1, 7, new CFClient::UI::Slider
340	req_w => 100,	652	req_w => 100,
341	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	653	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		654	tooltip => "This is the size of the portion of the map update the server sends you. "
		655	."If you set this to a high value you will be able to see further for example.",
342	connect_changed => sub {	656	connect_changed => sub {
343	my ($self, $value) = @_;	657	my ($self, $value) = @_;
344		658
345	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	659	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
346	},	660	},
…		…
362	user_h => int $::HEIGHT / 5,	676	user_h => int $::HEIGHT / 5,
363	child => (my $vbox = new CFClient::UI::VBox);	677	child => (my $vbox = new CFClient::UI::VBox);
364		678
365	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	679	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
366	expand => 1,	680	expand => 1,
		681	font => $FONT_FIXED,
367	fontsize => $::CFG->{log_fontsize},	682	fontsize => $::CFG->{log_fontsize},
368	);	683	);
369		684
370	$vbox->add (my $input = new CFClient::UI::Entry	685	$vbox->add (my $input = new CFClient::UI::Entry
371	connect_focus_in => sub {	686	connect_focus_in => sub {
…		…
465		780
466	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);	781	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
467	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);	782	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
468	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);	783	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
469		784
		785	$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
		786	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		787
470	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	788	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
471	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	789	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
472	status "Configuration Saved";	790	status "Configuration Saved";
473	});	791	});
474		792
475	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	793	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
476
477
478	$CFClient::UI::ROOT->add (make_stats_window);
479	}	794	}
480		795
481	sub video_shutdown {	796	sub video_shutdown {
482	$CFClient::UI::ROOT->{children} = [];	797	$CFClient::UI::ROOT->{children} = [];
483	undef $SDL_ACTIVE;	798	undef $SDL_ACTIVE;
…		…
589	@conn::ISA = Crossfire::Protocol::;	904	@conn::ISA = Crossfire::Protocol::;
590		905
591	sub conn::stats_update {	906	sub conn::stats_update {
592	my ($self, $stats) = @_;	907	my ($self, $stats) = @_;
593		908
594	# i love text protocols!!!
595	# FIXME: the stats are somehow weird
596	my $hp = $stats->{1};
597	my $hp_m = $stats->{2};
598	my $sp = $stats->{3};
599	my $sp_m = $stats->{4};
600	my $fo = $stats->{18};
601	my $fo_m = 999;
602	my $gr = $stats->{23};
603	my $gr_m = $stats->{24};
604
605	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
606	$GAUGES->{hp} ->set_value ($hp, $hp_m);
607	$GAUGES->{mana} ->set_value ($sp, $sp_m);
608	$GAUGES->{food} ->set_value ($fo, $fo_m);
609	$GAUGES->{grace}->set_value ($gr, $gr_m);
610
611	update_stats_window ($stats);	909	update_stats_window ($stats);
612	}	910	}
613		911
614	sub conn::user_send {	912	sub conn::user_send {
615	my ($self, $command) = @_;	913	my ($self, $command) = @_;
…		…
746		1044
747	$x += $ox;	1045	$x += $ox;
748	$y += $oy;	1046	$y += $oy;
749		1047
750	$self->{map_info} = [$hash, $x, $y, $w, $h];	1048	$self->{map_info} = [$hash, $x, $y, $w, $h];
		1049
		1050	my $map = $self->{map_info}[0];
		1051	$map =~ s/^.*?\/([^\/]+)$/\1/;
		1052	$STATWIDS->{map}->set_text ("Map: " . $map);
751		1053
752	$self->load_map ($hash, $x, $y);	1054	$self->load_map ($hash, $x, $y);
753	}	1055	}
754		1056
755	sub conn::face_find {	1057	sub conn::face_find {
…		…
820		1122
821	$chunk->play;	1123	$chunk->play;
822	# warn "sound $x,$y,$soundnum,$type\n";#d#	1124	# warn "sound $x,$y,$soundnum,$type\n";#d#
823	}	1125	}
824		1126
		1127	my $LAST_QUERY; # server is stupid, stupid, stupid
		1128
825	sub conn::query {	1129	sub conn::query {
826	my ($self, $flags, $prompt) = @_;	1130	my ($self, $flags, $prompt) = @_;
827		1131
828	#TODO, display dialog with relevant information	1132	$prompt = $LAST_QUERY unless length $prompt;
829	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1133	$LAST_QUERY = $prompt;
		1134
		1135	my $dialog = new CFClient::UI::FancyFrame
		1136	title => "Query",
		1137	child => my $vbox = new CFClient::UI::VBox;
		1138
		1139	$vbox->add (new CFClient::UI::Label
		1140	max_w => $::WIDTH * 0.4,
		1141	text => $prompt);
		1142
		1143	if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
		1144	$vbox->add (my $hbox = new CFClient::HBox);
		1145	$hbox->add (new CFClient::Button
		1146	text => "No",
		1147	connect_activate => sub {
		1148	$self->send ("reply n");
		1149	$dialog->destroy;
		1150	$MAPWIDGET->focus_in;
		1151	}
		1152	);
		1153	$hbox->add (new CFClient::Button
		1154	text => "Yes",
		1155	connect_activate => sub {
		1156	$self->send ("reply y");
		1157	$dialog->destroy;
		1158	$MAPWIDGET->focus_in;
		1159	},
		1160	);
		1161
		1162	$dialog->focus_in;
		1163
		1164	} elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
		1165	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
		1166	$vbox->add (my $entry = new CFClient::UI::Entry
		1167	connect_changed => sub {
		1168	$self->send ("reply $_[1]");
		1169	$dialog->destroy;
		1170	$MAPWIDGET->focus_in;
		1171	},
		1172	);
		1173
		1174	$entry->focus_in;
		1175
		1176	} else {
		1177	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		1178
		1179	$vbox->add (my $entry = new CFClient::UI::Entry
		1180	$flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
		1181	connect_activate => sub {
		1182	$self->send ("reply $_[1]");
		1183	$dialog->destroy;
		1184	$MAPWIDGET->focus_in;
		1185	},
		1186	);
		1187
		1188	$entry->focus_in;
		1189	}
		1190
		1191	$dialog->show;
830	}	1192	}
831		1193
832	sub conn::drawinfo {	1194	sub conn::drawinfo {
833	my ($self, $color, $text) = @_;	1195	my ($self, $color, $text) = @_;
834		1196
…		…
852	}	1214	}
853		1215
854	sub conn::spell_add {	1216	sub conn::spell_add {
855	my ($self, $spell) = @_;	1217	my ($self, $spell) = @_;
856		1218
		1219	# TODO
		1220	# create a widget dynamically, using spell face (CF::Protocol downloads them)
857	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {	1221	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message});
858	});
859	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {	1222	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message});
860	});
861	}	1223	}
862		1224
863	sub conn::spell_delete {	1225	sub conn::spell_delete {
864	my ($self, $spell) = @_;	1226	my ($self, $spell) = @_;
865	}	1227	}
866		1228
867	sub conn::addme_success {	1229	sub conn::addme_success {
868	my ($self) = @_;	1230	my ($self) = @_;
869		1231
870	for my $skill (values %{$self->{skill_info}}) {	1232	for my $skill (values %{$self->{skill_info}}) {
871	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {	1233	$MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
872	});	1234	$MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
873	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
874	});
875	}	1235	}
		1236	}
		1237
		1238	sub conn::container_add {
		1239	my ($self, $id, $items) = @_;
		1240
		1241	# 0 floor
		1242	# $self-<{player}{tag} => player inv
		1243	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
		1244	}
		1245
		1246	sub conn::container_clear {
		1247	my ($self, $id) = @_;
		1248	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
876	}	1249	}
877		1250
878	%SDL_CB = (	1251	%SDL_CB = (
879	CFClient::SDL_QUIT => sub {	1252	CFClient::SDL_QUIT => sub {
880	Event::unloop -1;	1253	Event::unloop -1;
…		…
915	sdl_mode => 0,	1288	sdl_mode => 0,
916	width => 640,	1289	width => 640,
917	height => 480,	1290	height => 480,
918	fullscreen => 0,	1291	fullscreen => 0,
919	fast => 0,	1292	fast => 0,
		1293	map_scale => 0.5,
920	fow_enable => 1,	1294	fow_enable => 1,
921	fow_intensity => 0.45,	1295	fow_intensity => 0.45,
922	fow_smooth => 0,	1296	fow_smooth => 0,
923	gui_fontsize => 1,	1297	gui_fontsize => 1,
924	log_fontsize => 14,	1298	log_fontsize => 1,
		1299	gauge_fontsize => 1,
		1300	gauge_size => 0.35,
		1301	stat_fontsize => 1,
925	mapsize => 100,	1302	mapsize => 100,
926	host => "crossfire.schmorp.de",	1303	host => "crossfire.schmorp.de",
927	say_command => 'say',	1304	say_command => 'say',
928	audio_enable => 1,	1305	audio_enable => 1,
929	bgm_enable => 1,	1306	bgm_enable => 1,
…		…
943	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1320	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
944		1321
945	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1322	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
946		1323
947	{	1324	{
948	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	1325	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
		1326	DejaVuSans.ttf
		1327	DejaVuSansMono.ttf
		1328	DejaVuSans-Bold.ttf
		1329	DejaVuSansMono-Bold.ttf
		1330	DejaVuSans-Oblique.ttf
		1331	DejaVuSansMono-Oblique.ttf
		1332	DejaVuSans-BoldOblique.ttf
		1333	DejaVuSansMono-BoldOblique.ttf
		1334	);
949		1335
950	CFClient::add_font $_ for @fonts;	1336	CFClient::add_font $_ for @fonts;
951	CFClient::set_font $fonts[0];	1337
		1338	$FONT_PROP = new_from_file CFClient::Font $fonts[0];
		1339	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];
		1340
		1341	$FONT_PROP->make_default;
952	}	1342	}
953		1343
954	video_init;	1344	video_init;
955	audio_init;	1345	audio_init;
956		1346

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.154 by elmex, Thu Apr 20 16:29:40 2006 UTC vs. Revision 1.171 by root, Mon Apr 24 03:33:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.154 by elmex, Thu Apr 20 16:29:40 2006 UTC vs.
Revision 1.171 by root, Mon Apr 24 03:33:51 2006 UTC