[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.125 by root, Wed Oct 18 12:53:45 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.53';
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
34	our %STAT_TOOLTIP = (
35	Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack",
36	Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed",
37	Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have",
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",
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		42
51	=item guard { BLOCK }	43	=item guard { BLOCK }
52		44
53	Returns an object that executes the given block as soon as it is destroyed.	45	Returns an object that executes the given block as soon as it is destroyed.
54		46
…		…
70	s/</</g;	62	s/</</g;
71		63
72	$_	64	$_
73	}	65	}
74		66
		67	sub socketpipe() {
		68	socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		69	or die "cannot establish bidiretcional pipe: $!\n";
		70
		71	($fh1, $fh2)
		72	}
		73
		74	sub background(&) {
		75	my ($cb) = @_;
		76
		77	my ($fh_r, $fh_w) = CFPlus::socketpipe;
		78
		79	my $pid = fork;
		80
		81	if (defined $pid && !$pid) {
		82	local $SIG{__DIE__};
		83
		84	open STDOUT, ">&", $fh_w;
		85	open STDERR, ">&", $fh_w;
		86	close $fh_r;
		87	close $fh_w;
		88
		89	$\| = 1;
		90
		91	eval { $cb->() };
		92
		93	if ($@) {
		94	my $msg = $@;
		95	$msg =~ s/\n+/\n/;
		96	warn "FATAL: $msg";
		97	CFPlus::_exit 1;
		98	}
		99
		100	# win32 is fucked up, of course. exit will clean stuff up,
		101	# which destroys our database etc. _exit will exit ALL
		102	# forked processes, because of the dreaded fork emulation.
		103	CFPlus::_exit 0;
		104	}
		105
		106	close $fh_w;
		107
		108	my $buffer;
		109
		110	Event->io (fd => $fh_r, poll => 'r', cb => sub {
		111	unless (sysread $fh_r, $buffer, 4096, length $buffer) {
		112	$_[0]->w->cancel;
		113	$buffer .= "done\n";
		114	}
		115
		116	while ($buffer =~ s/^(.*)\n//) {
		117	my $line = $1;
		118	$line =~ s/\s+$//;
		119	utf8::decode $line;
		120	::message ({
		121	markup => "editor($pid): " . CFPlus::asxml $line,
		122	});
		123	}
		124	});
		125	}
		126
75	package CFPlus::Database;	127	package CFPlus::Database;
76		128
77	our @ISA = BerkeleyDB::Btree::;	129	our @ISA = BerkeleyDB::Btree::;
78		130
79	sub get($$) {	131	sub get($$) {
…		…
87	my %DB_SYNC;	139	my %DB_SYNC;
88		140
89	sub put($$$) {	141	sub put($$$) {
90	my ($db, $key, $data) = @_;	142	my ($db, $key, $data) = @_;
91		143
		144	my $hkey = $db + 0;
		145	Scalar::Util::weaken $db;
92	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });	146	$DB_SYNC{$hkey} \|\|= AnyEvent->timer (after => 5, cb => sub {
		147	delete $DB_SYNC{$hkey};
		148	$db->db_sync if $db;
		149	});
93		150
94	$db->db_put ($key => $data)	151	$db->db_put ($key => $data)
95	}	152	}
96		153
97	package CFPlus;	154	package CFPlus;
…		…
105	}	162	}
106		163
107	die "FATAL: can't find required file $_[0]\n";	164	die "FATAL: can't find required file $_[0]\n";
108	}	165	}
109		166
110	$JSON::Syck::ImplicitUnicode = 1;	167	BEGIN {
111		168	use Crossfire::Protocol::Base ();
112	sub from_json {	169	*to_json = \&Crossfire::Protocol::Base::to_json;
113	JSON::Syck::Load $_[0]	170	*from_json = \&Crossfire::Protocol::Base::from_json;
114	}
115
116	sub to_json {
117	JSON::Syck::Dump $_[0]
118	}	171	}
119		172
120	sub read_cfg {	173	sub read_cfg {
121	my ($file) = @_;	174	my ($file) = @_;
122		175
…		…
145	open my $fh, ">:utf8", $file	198	open my $fh, ">:utf8", $file
146	or return;	199	or return;
147	print $fh to_json $::CFG;	200	print $fh to_json $::CFG;
148	}	201	}
149		202
		203	sub http_proxy {
		204	my @proxy = win32_proxy_info;
		205
		206	if (@proxy) {
		207	"http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
		208	} elsif (exists $ENV{http_proxy}) {
		209	$ENV{http_proxy}
		210	} else {
		211	()
		212	}
		213	}
		214
		215	sub set_proxy {
		216	my $proxy = http_proxy
		217	or return;
		218
		219	$ENV{http_proxy} = $proxy;
		220	}
		221
150	our $DB_ENV;	222	our $DB_ENV;
		223	our $DB_STATE;
		224
		225	sub db_table($) {
		226	my ($table) = @_;
		227
		228	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
		229
		230	new CFPlus::Database
		231	-Env => $DB_ENV,
		232	-Filename => $table,
		233	# -Filename => "database",
		234	# -Subname => $table,
		235	-Property => DB_CHKSUM,
		236	-Flags => DB_CREATE \| DB_UPGRADE,
		237	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
		238	}
151		239
152	{	240	{
153	use strict;	241	use strict;
154		242
155	mkdir "$Crossfire::VARDIR/cfplus", 0777;	243	mkdir "$Crossfire::VARDIR/cfplus", 0777;
…		…
164	# -ErrPrefix => "DATABASE",	252	# -ErrPrefix => "DATABASE",
165	-Verbose => 1,	253	-Verbose => 1,
166	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,	254	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
167	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,	255	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
168	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";	256	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
169	}
170		257
171	sub db_table($) {	258	$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	}	259	}
185		260
186	package CFPlus::Layout;	261	package CFPlus::Layout;
187		262
188	$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {	263	$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
…		…
231	}	306	}
232		307
233	sub do_n_dialog {	308	sub do_n_dialog {
234	my ($cb) = @_;	309	my ($cb) = @_;
235		310
236	my $w = new CFPlus::UI::FancyFrame	311	my $w = new CFPlus::UI::Toplevel
237	on_delete => sub { $_[0]->destroy; 1 },	312	on_delete => sub { $_[0]->destroy; 1 },
238	has_close_button => 1,	313	has_close_button => 1,
239	;	314	;
240		315
241	$w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");	316	$w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
…		…
294	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	369	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
295	["ignite/thaw", # first try of an easier use of flint&steel	370	["ignite/thaw", # first try of an easier use of flint&steel
296	sub {	371	sub {
297	$::CONN->send ("mark ". pack "N", $self->{tag});	372	$::CONN->send ("mark ". pack "N", $self->{tag});
298	$::CONN->send ("command apply flint and steel");	373	$::CONN->send ("command apply flint and steel");
		374	}
		375	],
		376	["inscribe", # first try of an easier use of flint&steel
		377	sub {
		378	&::open_string_query ("Text to inscribe", sub {
		379	my ($entry, $txt) = @_;
		380	$::CONN->send ("mark ". pack "N", $self->{tag});
		381	$::CONN->send ("command use_skill inscription $txt");
		382	});
		383	}
		384	],
		385	["rename", # first try of an easier use of flint&steel
		386	sub {
		387	&::open_string_query ("Rename item to:", sub {
		388	my ($entry, $txt) = @_;
		389	$::CONN->send ("mark ". pack "N", $self->{tag});
		390	$::CONN->send ("command rename to <$txt>");
		391	}, $self->{name},
		392	"If you input no name or erase the current custom name, the custom name will be unset");
299	}	393	}
300	],	394	],
301	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	395	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
302	(	396	(
303	$self->{flags} & F_LOCKED	397	$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.125 by root, Wed Oct 18 12:53:45 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.125 by root, Wed Oct 18 12:53:45 2006 UTC