[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC.pm

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.108 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.130 by root, Sun Dec 3 16:48:24 2006 UTC

…		…
12		12
13	=cut	13	=cut
14		14
15	package CFPlus;	15	package CFPlus;
16		16
		17	use Carp ();
		18
17	BEGIN {	19	BEGIN {
18	$VERSION = '0.1';	20	$VERSION = '0.97';
19		21
20	use XSLoader;	22	use XSLoader;
21	XSLoader::load "CFPlus", $VERSION;	23	XSLoader::load "CFPlus", $VERSION;
22	}	24	}
23		25
24	use utf8;	26	use utf8;
25		27
26	use Carp ();
27	use AnyEvent ();	28	use AnyEvent ();
28	use BerkeleyDB;	29	use BerkeleyDB;
29	use Pod::POM ();	30	use Pod::POM ();
30	use Scalar::Util ();	31	use Scalar::Util ();
31	use JSON::Syck ();
32	use Storable (); # finally	32	use Storable (); # finally
33		33
34	our %STAT_TOOLTIP = (	34	BEGIN {
35	Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack",	35	use Crossfire::Protocol::Base ();
36	Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed",	36	*to_json = \&Crossfire::Protocol::Base::to_json;
37	Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have",	37	*from_json = \&Crossfire::Protocol::Base::from_json;
38	Int => "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have",	38	}
39	Wis => "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have",
40	Pow => "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up",
41	Cha => "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops.",
42
43	Wc => "<b>Weapon Class</b>, 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.",
44	Ac => "<b>Armour Class</b>, 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.",
45	Dam => "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack.",
46	Arm => "<b>Armour</b>, 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. This is the same as the physical resistance.",
47	Spd => "<b>Speed</b>, 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.",
48	WSp => "<b>Weapon Speed</b>, 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.",
49	);
50		39
51	=item guard { BLOCK }	40	=item guard { BLOCK }
52		41
53	Returns an object that executes the given block as soon as it is destroyed.	42	Returns an object that executes the given block as soon as it is destroyed.
54		43
…		…
70	s/</</g;	59	s/</</g;
71		60
72	$_	61	$_
73	}	62	}
74		63
		64	sub socketpipe() {
		65	socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		66	or die "cannot establish bidiretcional pipe: $!\n";
		67
		68	($fh1, $fh2)
		69	}
		70
		71	sub background(&;&) {
		72	my ($bg, $cb) = @_;
		73
		74	my ($fh_r, $fh_w) = CFPlus::socketpipe;
		75
		76	my $pid = fork;
		77
		78	if (defined $pid && !$pid) {
		79	local $SIG{__DIE__};
		80
		81	open STDOUT, ">&", $fh_w;
		82	open STDERR, ">&", $fh_w;
		83	close $fh_r;
		84	close $fh_w;
		85
		86	$\| = 1;
		87
		88	eval { $bg->() };
		89
		90	if ($@) {
		91	my $msg = $@;
		92	$msg =~ s/\n+/\n/;
		93	warn "FATAL: $msg";
		94	CFPlus::_exit 1;
		95	}
		96
		97	# win32 is fucked up, of course. exit will clean stuff up,
		98	# which destroys our database etc. _exit will exit ALL
		99	# forked processes, because of the dreaded fork emulation.
		100	CFPlus::_exit 0;
		101	}
		102
		103	close $fh_w;
		104
		105	my $buffer;
		106
		107	my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
		108	unless (sysread $fh_r, $buffer, 4096, length $buffer) {
		109	undef $w;
		110	$cb->();
		111	return;
		112	}
		113
		114	while ($buffer =~ s/^(.*)\n//) {
		115	my $line = $1;
		116	$line =~ s/\s+$//;
		117	utf8::decode $line;
		118	if ($line =~ /^\x{e877}json_msg (.*)$/s) {
		119	$cb->(from_json $1);
		120	} else {
		121	::message ({
		122	markup => "background($pid): " . CFPlus::asxml $line,
		123	});
		124	}
		125	}
		126	});
		127	}
		128
		129	sub background_msg {
		130	my ($msg) = @_;
		131
		132	$msg = "\x{e877}json_msg " . to_json $msg;
		133	$msg =~ s/\n//g;
		134	utf8::encode $msg;
		135	print $msg, "\n";
		136	}
		137
75	package CFPlus::Database;	138	package CFPlus::Database;
76		139
77	our @ISA = BerkeleyDB::Btree::;	140	our @ISA = BerkeleyDB::Btree::;
78		141
79	sub get($$) {	142	sub get($$) {
…		…
87	my %DB_SYNC;	150	my %DB_SYNC;
88		151
89	sub put($$$) {	152	sub put($$$) {
90	my ($db, $key, $data) = @_;	153	my ($db, $key, $data) = @_;
91		154
		155	my $hkey = $db + 0;
		156	Scalar::Util::weaken $db;
92	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });	157	$DB_SYNC{$hkey} \|\|= AnyEvent->timer (after => 5, cb => sub {
		158	delete $DB_SYNC{$hkey};
		159	$db->db_sync if $db;
		160	});
93		161
94	$db->db_put ($key => $data)	162	$db->db_put ($key => $data)
95	}	163	}
96		164
97	package CFPlus;	165	package CFPlus;
…		…
103	$path = "$_/CFPlus/resources/$_[0]";	171	$path = "$_/CFPlus/resources/$_[0]";
104	return $path if -r $path;	172	return $path if -r $path;
105	}	173	}
106		174
107	die "FATAL: can't find required file $_[0]\n";	175	die "FATAL: can't find required file $_[0]\n";
108	}
109
110	$JSON::Syck::ImplicitUnicode = 1;
111
112	sub from_json {
113	JSON::Syck::Load $_[0]
114	}
115
116	sub to_json {
117	JSON::Syck::Dump $_[0]
118	}	176	}
119		177
120	sub read_cfg {	178	sub read_cfg {
121	my ($file) = @_;	179	my ($file) = @_;
122		180
…		…
145	open my $fh, ">:utf8", $file	203	open my $fh, ">:utf8", $file
146	or return;	204	or return;
147	print $fh to_json $::CFG;	205	print $fh to_json $::CFG;
148	}	206	}
149		207
		208	sub http_proxy {
		209	my @proxy = win32_proxy_info;
		210
		211	if (@proxy) {
		212	"http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
		213	} elsif (exists $ENV{http_proxy}) {
		214	$ENV{http_proxy}
		215	} else {
		216	()
		217	}
		218	}
		219
		220	sub set_proxy {
		221	my $proxy = http_proxy
		222	or return;
		223
		224	$ENV{http_proxy} = $proxy;
		225	}
		226
		227	sub lwp_useragent {
		228	require LWP::UserAgent;
		229
		230	CFPlus::set_proxy;
		231
		232	my $ua = LWP::UserAgent->new (
		233	agent => "cfplus $VERSION",
		234	keep_alive => 1,
		235	env_proxy => 1,
		236	timeout => 30,
		237	);
		238	}
		239
		240	sub lwp_check($) {
		241	my ($res) = @_;
		242
		243	$res->is_error
		244	and die $res->status_line;
		245
		246	$res
		247	}
		248
150	our $DB_ENV;	249	our $DB_ENV;
		250	our $DB_STATE;
		251
		252	sub db_table($) {
		253	my ($table) = @_;
		254
		255	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		256
		257	new CFPlus::Database
		258	-Env => $DB_ENV,
		259	-Filename => $table,
		260	# -Filename => "database",
		261	# -Subname => $table,
		262	-Property => DB_CHKSUM,
		263	-Flags => DB_CREATE \| DB_UPGRADE,
		264	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
		265	}
151		266
152	{	267	{
153	use strict;	268	use strict;
154		269
155	mkdir "$Crossfire::VARDIR/cfplus", 0777;	270	mkdir "$Crossfire::VARDIR/cfplus", 0777;
…		…
164	# -ErrPrefix => "DATABASE",	279	# -ErrPrefix => "DATABASE",
165	-Verbose => 1,	280	-Verbose => 1,
166	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,	281	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
167	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,	282	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
168	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";	283	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
169	}
170		284
171	sub db_table($) {	285	$DB_STATE = db_table "state";
172	my ($table) = @_;
173
174	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
175
176	new CFPlus::Database
177	-Env => $DB_ENV,
178	-Filename => $table,
179	# -Filename => "database",
180	# -Subname => $table,
181	-Property => DB_CHKSUM,
182	-Flags => DB_CREATE \| DB_UPGRADE,
183	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
184	}	286	}
185		287
186	package CFPlus::Layout;	288	package CFPlus::Layout;
187		289
188	$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {	290	$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
…		…
231	}	333	}
232		334
233	sub do_n_dialog {	335	sub do_n_dialog {
234	my ($cb) = @_;	336	my ($cb) = @_;
235		337
236	my $w = new CFPlus::UI::FancyFrame	338	my $w = new CFPlus::UI::Toplevel
237	on_delete => sub { $_[0]->destroy; 1 },	339	on_delete => sub { $_[0]->destroy; 1 },
238	has_close_button => 1,	340	has_close_button => 1,
239	;	341	;
240		342
241	$w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");	343	$w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
…		…
294	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	396	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
295	["ignite/thaw", # first try of an easier use of flint&steel	397	["ignite/thaw", # first try of an easier use of flint&steel
296	sub {	398	sub {
297	$::CONN->send ("mark ". pack "N", $self->{tag});	399	$::CONN->send ("mark ". pack "N", $self->{tag});
298	$::CONN->send ("command apply flint and steel");	400	$::CONN->send ("command apply flint and steel");
		401	}
		402	],
		403	["inscribe", # first try of an easier use of flint&steel
		404	sub {
		405	&::open_string_query ("Text to inscribe", sub {
		406	my ($entry, $txt) = @_;
		407	$::CONN->send ("mark ". pack "N", $self->{tag});
		408	$::CONN->send ("command use_skill inscription $txt");
		409	});
		410	}
		411	],
		412	["rename", # first try of an easier use of flint&steel
		413	sub {
		414	&::open_string_query ("Rename item to:", sub {
		415	my ($entry, $txt) = @_;
		416	$::CONN->send ("mark ". pack "N", $self->{tag});
		417	$::CONN->send ("command rename to <$txt>");
		418	}, $self->{name},
		419	"If you input no name or erase the current custom name, the custom name will be unset");
299	}	420	}
300	],	421	],
301	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	422	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
302	(	423	(
303	$self->{flags} & F_LOCKED	424	$self->{flags} & F_LOCKED

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.108 by root, Sun Jul 30 13:16:44 2006 UTC vs. Revision 1.130 by root, Sun Dec 3 16:48:24 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.108 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.130 by root, Sun Dec 3 16:48:24 2006 UTC