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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC

…		…
91	our $SETUP_NOTEBOOK;	91	our $SETUP_NOTEBOOK;
92	our $SETUP_SERVER;	92	our $SETUP_SERVER;
93	our $SETUP_KEYBOARD;	93	our $SETUP_KEYBOARD;
94	our $SETUP_SPELLS;	94	our $SETUP_SPELLS;
95		95
		96	our $STATS_WINDOW;
		97	our $MESSAGE_WINDOW;
96	our $FLOORBOX;	98	our $FLOORBOX;
97	our $GAUGES;	99	our $GAUGES;
98	our $STATWIDS;	100	our $STATWIDS;
99		101
100	our $SDL_ACTIVE;	102	our $SDL_ACTIVE;
…		…
121	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	123	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
122	}	124	}
123		125
124	sub debug {	126	sub debug {
125	$DEBUG_STATUS->set_text ($_[0]);	127	$DEBUG_STATUS->set_text ($_[0]);
		128	}
		129
		130	sub destroy_query_dialog {
		131	(delete $_[0]{query_dialog})->destroy
		132	if $_[0]{query_dialog};
		133	}
		134
		135	# server query dialog
		136	sub server_query {
		137	my ($conn, $flags, $prompt) = @_;
		138
		139	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
		140	x => "center",
		141	y => "center",
		142	title => "Server Query",
		143	child => my $vbox = new CFClient::UI::VBox,
		144	;
		145
		146	my @dialog = my $label = new CFClient::UI::Label
		147	max_w => $::WIDTH * 0.4,
		148	ellipsise => 0,
		149	text => $prompt;
		150
		151	if ($flags & CS_QUERY_YESNO) {
		152	push @dialog, my $hbox = new CFClient::UI::HBox;
		153
		154	$hbox->add (new CFClient::UI::Button
		155	text => "No",
		156	on_activate => sub {
		157	$conn->send ("reply n");
		158	$dialog->destroy;
		159	}
		160	);
		161	$hbox->add (new CFClient::UI::Button
		162	text => "Yes",
		163	on_activate => sub {
		164	$conn->send ("reply y");
		165	destroy_query_dialog $conn;
		166	},
		167	);
		168
		169	$dialog->focus_in;
		170
		171	} elsif ($flags & CS_QUERY_SINGLECHAR) {
		172	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
		173
		174	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {
		175	$MESSAGE_WINDOW->show;
		176
		177	unshift @dialog, new CFClient::UI::Label
		178	max_w => $::WIDTH * 0.4,
		179	ellipsise => 0,
		180	markup => "\nOr use your keyboard:\n";
		181
		182	unshift @dialog, my $table = new CFClient::UI::Table;
		183
		184	$table->add (0, 0, new CFClient::UI::Button
		185	text => "Next Race",
		186	on_activate => sub {
		187	$conn->send ("reply n");
		188	destroy_query_dialog $conn;
		189	},
		190	);
		191	$table->add (2, 0, new CFClient::UI::Button
		192	text => "Accept",
		193	on_activate => sub {
		194	$conn->send ("reply d");
		195	destroy_query_dialog $conn;
		196	},
		197	);
		198
		199	unshift @dialog, new CFClient::UI::Label
		200	max_w => $::WIDTH * 0.4,
		201	ellipsise => 0,
		202	markup =>
		203	"<big><b>Character Creation: Race</b></big>\n\n"
		204	. "Look at the <b>Messages</b> window to see a description of this race "
		205	. "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
		206	. "and the center of the screen to see how this race looks like "
		207	. "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
		208	. "You can look at another race, or accept this race (you will come back to this race eventually, "
		209	. "so you can take your time making this important choice."
		210	;
		211
		212	} elsif ($prompt =~ /roll new stats/) {
		213	if (my $stat = delete $conn->{stat_change_with}) {
		214	$conn->send ("reply $stat");
		215	destroy_query_dialog $conn;
		216	return;
		217	}
		218
		219	$STATS_WINDOW->show;
		220	$MESSAGE_WINDOW->hide;
		221
		222	unshift @dialog, new CFClient::UI::Label
		223	max_w => $::WIDTH * 0.4,
		224	ellipsise => 0,
		225	markup => "\nOr use your keyboard:\n";
		226
		227	unshift @dialog, my $table = new CFClient::UI::Table;
		228
		229	# left: re-roll
		230	$table->add (0, 0, new CFClient::UI::Button
		231	text => "Roll Again",
		232	on_activate => sub {
		233	$conn->send ("reply y");
		234	destroy_query_dialog $conn;
		235	},
		236	);
		237
		238	# center: swap stats
		239	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
		240	value => $_,
		241	options => [
		242	[Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
		243	[Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		244	[Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		245	[Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		246	[Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		247	[Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
		248	[Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
		249	],
		250	), 1 .. 2;
		251
		252	$table->add (2, 0, new CFClient::UI::Button
		253	text => "Swap Stats",
		254	on_activate => sub {
		255	$conn->{stat_change_with} = $sw2->{value};
		256	$conn->send ("reply $sw1->{value}");
		257	destroy_query_dialog $conn;
		258	},
		259	);
		260	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
		261
		262	# right: accept
		263	$table->add (4, 0, new CFClient::UI::Button
		264	text => "Accept",
		265	on_activate => sub {
		266	$conn->send ("reply n");
		267	$STATS_WINDOW->hide;
		268	destroy_query_dialog $conn;
		269	},
		270	);
		271
		272	unshift @dialog, new CFClient::UI::Label
		273	max_w => $::WIDTH * 0.4,
		274	ellipsise => 0,
		275	markup =>
		276	"<big><b>Character Creation: Stats</b></big>\n\n"
		277	. "Look at the <b>Stats</b> window to see your basic stats "
		278	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
		279	. "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
		280	. "Race selection will influence those values later on."
		281	;
		282	}
		283
		284	push @dialog, my $entry = new CFClient::UI::Entry
		285	on_changed => sub {
		286	$conn->send ("reply $_[1]");
		287	destroy_query_dialog $conn;
		288	},
		289	;
		290
		291	$entry->focus_in;
		292
		293	} else {
		294	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		295
		296	push @dialog, my $entry = new CFClient::UI::Entry
		297	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
		298	on_activate => sub {
		299	$conn->send ("reply $_[1]");
		300	destroy_query_dialog $conn;
		301	},
		302	;
		303
		304	$entry->focus_in;
		305	}
		306
		307	$vbox->add (@dialog);
		308	$dialog->show;
126	}	309	}
127		310
128	sub start_game {	311	sub start_game {
129	status "logging in...";	312	status "logging in...";
130		313
…		…
149	map_widget => $MAPWIDGET,	332	map_widget => $MAPWIDGET,
150	logview => $LOGVIEW,	333	logview => $LOGVIEW,
151	statusbox => $STATUSBOX,	334	statusbox => $STATUSBOX,
152	map => $MAP,	335	map => $MAP,
153	mapmap => $MAPMAP,	336	mapmap => $MAPMAP,
		337	query => \&server_query,
154		338
155	sound_play => sub {	339	sound_play => sub {
156	my ($x, $y, $soundnum, $type) = @_;	340	my ($x, $y, $soundnum, $type) = @_;
157		341
158	$SDL_MIXER	342	$SDL_MIXER
…		…
183		367
184	return unless $CONN;	368	return unless $CONN;
185		369
186	status "connection closed";	370	status "connection closed";
187		371
		372	destroy_query_dialog $CONN;
188	$CONN->destroy;	373	$CONN->destroy;
189	$CONN = 0; # false, does not autovivify	374	$CONN = 0; # false, does not autovivify
190	}	375	}
191		376
192	sub graphics_setup {	377	sub graphics_setup {
…		…
441		626
442	$win	627	$win
443	}	628	}
444		629
445		630
446	sub make_stats_window {	631	sub stats_window {
447	my $tgw = new CFClient::UI::FancyFrame	632	my $tgw = new CFClient::UI::FancyFrame
448	y => $HEIGHT * (2/8),	633	y => $HEIGHT * (2/8),
449	x => "max",	634	x => "max",
450	title => "Stats",	635	title => "Stats",
451	name => "stats_window";	636	name => "stats_window";
…		…
851	title => "Messages",	1036	title => "Messages",
852	border_bg => [1, 1, 1, 1],	1037	border_bg => [1, 1, 1, 1],
853	bg => [0, 0, 0, 0.75],	1038	bg => [0, 0, 0, 0.75],
854	x => "max",	1039	x => "max",
855	y => 0,	1040	y => 0,
856	force_w => $::WIDTH / 3,	1041	force_w => $::WIDTH * 0.4,
857	force_h => $::HEIGHT / 5,	1042	force_h => $::HEIGHT * 0.5,
858	child => (my $vbox = new CFClient::UI::VBox);	1043	child => (my $vbox = new CFClient::UI::VBox);
859		1044
860	$vbox->add ($LOGVIEW);	1045	$vbox->add ($LOGVIEW);
861		1046
862	$vbox->add (my $input = new CFClient::UI::Entry	1047	$vbox->add (my $input = new CFClient::UI::Entry
…		…
1001	}	1186	}
1002		1187
1003	$table	1188	$table
1004	}	1189	}
1005		1190
1006	sub make_inventory_window {	1191	sub inventory_window {
1007	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1192	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008	x => "center",	1193	x => "center",
1009	y => "center",	1194	y => "center",
1010	force_w => $WIDTH * 9/10,	1195	force_w => $WIDTH * 9/10,
1011	force_h => $HEIGHT * 9/10,	1196	force_h => $HEIGHT * 9/10,
…		…
1270	force_w => $::WIDTH * 0.6,	1455	force_w => $::WIDTH * 0.6,
1271	force_h => $::HEIGHT * 0.6,	1456	force_h => $::HEIGHT * 0.6,
1272	;	1457	;
1273		1458
1274	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1459	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1275	filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);	1460	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1276		1461
1277	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1462	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1278	"Configure the server to play on, your username, password and other server-related options.");	1463	"Configure the server to play on, your username, password and other server-related options.");
1279	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1464	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1280	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1465	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
…		…
1295	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1480	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1296		1481
1297	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1482	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1298	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1483	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1299		1484
1300	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1485	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1301	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1486	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1302		1487
1303	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	1488	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
1304		1489
1305	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1490	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1306	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1491	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1307	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1492	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1308	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "	1493	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1309	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");	1494	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1310		1495
1311	$BUTTONBAR->add (new CFClient::UI::Button	1496	$BUTTONBAR->add (new CFClient::UI::Button
1312	text => "Save Config",	1497	text => "Save Config",
…		…
1574	map_scale => 1,	1759	map_scale => 1,
1575	fow_enable => 1,	1760	fow_enable => 1,
1576	fow_intensity => 0.45,	1761	fow_intensity => 0.45,
1577	fow_smooth => 0,	1762	fow_smooth => 0,
1578	gui_fontsize => 1,	1763	gui_fontsize => 1,
1579	log_fontsize => 1,	1764	log_fontsize => 0.7,
1580	gauge_fontsize=> 1,	1765	gauge_fontsize=> 1,
1581	gauge_size => 0.35,	1766	gauge_size => 0.35,
1582	stat_fontsize => 1,	1767	stat_fontsize => 0.7,
1583	mapsize => 100,	1768	mapsize => 100,
1584	host => "crossfire.schmorp.de",	1769	host => "crossfire.schmorp.de",
1585	say_command => 'say',	1770	say_command => 'say',
1586	audio_enable => 1,	1771	audio_enable => 1,
1587	bgm_enable => 1,	1772	bgm_enable => 1,

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC vs. Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.60 by root, Tue Jun 6 02:55:50 2006 UTC