[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.127 by root, Thu Nov 16 19:42:44 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.95';
19		21
20	use XSLoader;	22	use XSLoader;
21	XSLoader::load "CFPlus", $VERSION;	23	XSLoader::load "CFPlus", $VERSION;
22	}	24	}
23		25
		26	BEGIN {
		27	$SIG{__DIE__} = sub {
		28	return if CFPlus::in_destruct;
		29	#CFPlus::fatal $_[0];#d#
		30	CFPlus::error Carp::longmess $_[0];#d#
		31	die;#d#
		32	};
		33	}
		34
24	use utf8;	35	use utf8;
25		36
26	use Carp ();
27	use AnyEvent ();	37	use AnyEvent ();
28	use BerkeleyDB;	38	use BerkeleyDB;
29	use Pod::POM ();	39	use Pod::POM ();
30	use Scalar::Util ();	40	use Scalar::Util ();
31	use JSON::Syck ();
32	use Storable (); # finally	41	use Storable (); # finally
33		42
34	our %STAT_TOOLTIP = (	43	BEGIN {
35	Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack",	44	use Crossfire::Protocol::Base ();
36	Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed",	45	*to_json = \&Crossfire::Protocol::Base::to_json;
37	Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have",	46	*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",	47	}
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		48
51	=item guard { BLOCK }	49	=item guard { BLOCK }
52		50
53	Returns an object that executes the given block as soon as it is destroyed.	51	Returns an object that executes the given block as soon as it is destroyed.
54		52
…		…
70	s/</</g;	68	s/</</g;
71		69
72	$_	70	$_
73	}	71	}
74		72
		73	sub socketpipe() {
		74	socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		75	or die "cannot establish bidiretcional pipe: $!\n";
		76
		77	($fh1, $fh2)
		78	}
		79
		80	sub background(&;&) {
		81	my ($bg, $cb) = @_;
		82
		83	my ($fh_r, $fh_w) = CFPlus::socketpipe;
		84
		85	my $pid = fork;
		86
		87	if (defined $pid && !$pid) {
		88	local $SIG{__DIE__};
		89
		90	open STDOUT, ">&", $fh_w;
		91	open STDERR, ">&", $fh_w;
		92	close $fh_r;
		93	close $fh_w;
		94
		95	$\| = 1;
		96
		97	eval { $bg->() };
		98
		99	if ($@) {
		100	my $msg = $@;
		101	$msg =~ s/\n+/\n/;
		102	warn "FATAL: $msg";
		103	CFPlus::_exit 1;
		104	}
		105
		106	# win32 is fucked up, of course. exit will clean stuff up,
		107	# which destroys our database etc. _exit will exit ALL
		108	# forked processes, because of the dreaded fork emulation.
		109	CFPlus::_exit 0;
		110	}
		111
		112	close $fh_w;
		113
		114	my $buffer;
		115
		116	my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
		117	unless (sysread $fh_r, $buffer, 4096, length $buffer) {
		118	undef $w;
		119	$cb->();
		120	return;
		121	}
		122
		123	while ($buffer =~ s/^(.*)\n//) {
		124	my $line = $1;
		125	$line =~ s/\s+$//;
		126	utf8::decode $line;
		127	if ($line =~ /^\x{e877}json_msg (.*)$/s) {
		128	$cb->(from_json $1);
		129	} else {
		130	::message ({
		131	markup => "background($pid): " . CFPlus::asxml $line,
		132	});
		133	}
		134	}
		135	});
		136	}
		137
		138	sub background_msg {
		139	my ($msg) = @_;
		140
		141	$msg = "\x{e877}json_msg " . to_json $msg;
		142	$msg =~ s/\n//g;
		143	utf8::encode $msg;
		144	print $msg, "\n";
		145	}
		146
75	package CFPlus::Database;	147	package CFPlus::Database;
76		148
77	our @ISA = BerkeleyDB::Btree::;	149	our @ISA = BerkeleyDB::Btree::;
78		150
79	sub get($$) {	151	sub get($$) {
…		…
87	my %DB_SYNC;	159	my %DB_SYNC;
88		160
89	sub put($$$) {	161	sub put($$$) {
90	my ($db, $key, $data) = @_;	162	my ($db, $key, $data) = @_;
91		163
		164	my $hkey = $db + 0;
		165	Scalar::Util::weaken $db;
92	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });	166	$DB_SYNC{$hkey} \|\|= AnyEvent->timer (after => 5, cb => sub {
		167	delete $DB_SYNC{$hkey};
		168	$db->db_sync if $db;
		169	});
93		170
94	$db->db_put ($key => $data)	171	$db->db_put ($key => $data)
95	}	172	}
96		173
97	package CFPlus;	174	package CFPlus;
…		…
103	$path = "$_/CFPlus/resources/$_[0]";	180	$path = "$_/CFPlus/resources/$_[0]";
104	return $path if -r $path;	181	return $path if -r $path;
105	}	182	}
106		183
107	die "FATAL: can't find required file $_[0]\n";	184	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	}	185	}
119		186
120	sub read_cfg {	187	sub read_cfg {
121	my ($file) = @_;	188	my ($file) = @_;
122		189
…		…
145	open my $fh, ">:utf8", $file	212	open my $fh, ">:utf8", $file
146	or return;	213	or return;
147	print $fh to_json $::CFG;	214	print $fh to_json $::CFG;
148	}	215	}
149		216
		217	sub http_proxy {
		218	my @proxy = win32_proxy_info;
		219
		220	if (@proxy) {
		221	"http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
		222	} elsif (exists $ENV{http_proxy}) {
		223	$ENV{http_proxy}
		224	} else {
		225	()
		226	}
		227	}
		228
		229	sub set_proxy {
		230	my $proxy = http_proxy
		231	or return;
		232
		233	$ENV{http_proxy} = $proxy;
		234	}
		235
		236	sub lwp_useragent {
		237	require LWP::UserAgent;
		238
		239	CFPlus::set_proxy;
		240
		241	my $ua = LWP::UserAgent->new (
		242	agent => "cfplus $VERSION",
		243	keep_alive => 1,
		244	env_proxy => 1,
		245	timeout => 30,
		246	);
		247	}
		248
		249	sub lwp_check($) {
		250	my ($res) = @_;
		251
		252	$res->is_error
		253	and die $res->status_line;
		254
		255	$res
		256	}
		257
150	our $DB_ENV;	258	our $DB_ENV;
		259	our $DB_STATE;
		260
		261	sub db_table($) {
		262	my ($table) = @_;
		263
		264	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		265
		266	new CFPlus::Database
		267	-Env => $DB_ENV,
		268	-Filename => $table,
		269	# -Filename => "database",
		270	# -Subname => $table,
		271	-Property => DB_CHKSUM,
		272	-Flags => DB_CREATE \| DB_UPGRADE,
		273	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
		274	}
151		275
152	{	276	{
153	use strict;	277	use strict;
154		278
155	mkdir "$Crossfire::VARDIR/cfplus", 0777;	279	mkdir "$Crossfire::VARDIR/cfplus", 0777;
…		…
164	# -ErrPrefix => "DATABASE",	288	# -ErrPrefix => "DATABASE",
165	-Verbose => 1,	289	-Verbose => 1,
166	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,	290	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
167	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,	291	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
168	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";	292	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
169	}
170		293
171	sub db_table($) {	294	$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	}	295	}
185		296
186	package CFPlus::Layout;	297	package CFPlus::Layout;
187		298
188	$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {	299	$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
…		…
231	}	342	}
232		343
233	sub do_n_dialog {	344	sub do_n_dialog {
234	my ($cb) = @_;	345	my ($cb) = @_;
235		346
236	my $w = new CFPlus::UI::FancyFrame	347	my $w = new CFPlus::UI::Toplevel
237	on_delete => sub { $_[0]->destroy; 1 },	348	on_delete => sub { $_[0]->destroy; 1 },
238	has_close_button => 1,	349	has_close_button => 1,
239	;	350	;
240		351
241	$w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");	352	$w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
…		…
294	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	405	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
295	["ignite/thaw", # first try of an easier use of flint&steel	406	["ignite/thaw", # first try of an easier use of flint&steel
296	sub {	407	sub {
297	$::CONN->send ("mark ". pack "N", $self->{tag});	408	$::CONN->send ("mark ". pack "N", $self->{tag});
298	$::CONN->send ("command apply flint and steel");	409	$::CONN->send ("command apply flint and steel");
		410	}
		411	],
		412	["inscribe", # first try of an easier use of flint&steel
		413	sub {
		414	&::open_string_query ("Text to inscribe", sub {
		415	my ($entry, $txt) = @_;
		416	$::CONN->send ("mark ". pack "N", $self->{tag});
		417	$::CONN->send ("command use_skill inscription $txt");
		418	});
		419	}
		420	],
		421	["rename", # first try of an easier use of flint&steel
		422	sub {
		423	&::open_string_query ("Rename item to:", sub {
		424	my ($entry, $txt) = @_;
		425	$::CONN->send ("mark ". pack "N", $self->{tag});
		426	$::CONN->send ("command rename to <$txt>");
		427	}, $self->{name},
		428	"If you input no name or erase the current custom name, the custom name will be unset");
299	}	429	}
300	],	430	],
301	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	431	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
302	(	432	(
303	$self->{flags} & F_LOCKED	433	$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.127 by root, Thu Nov 16 19:42:44 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.127 by root, Thu Nov 16 19:42:44 2006 UTC