[ViewVC] Diff of: cvs/deliantra/server/server/skills.C

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.71 by root, Sat Nov 7 13:58:01 2009 UTC vs.
Revision 1.81 by root, Sun Apr 4 04:10:47 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2003 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	11	* option) any later version.
260		260
261	x = op->x + freearr_x[dir];	261	x = op->x + freearr_x[dir];
262	y = op->y + freearr_y[dir];	262	y = op->y + freearr_y[dir];
263		263
264	if (dir == 0)	264	if (dir == 0)
265	{	265	return 0; // you can't steal from ourself!
266	/* Can't steal from ourself! */
267	return 0;
268	}
269		266
270	m = op->map;	267	m = op->map;
271	mflags = get_map_flags (m, &m, x, y, &x, &y);	268	mflags = get_map_flags (m, &m, x, y, &x, &y);
272	/* Out of map - can't do it. If nothing alive on this space,	269	/* Out of map - can't do it. If nothing alive on this space,
273	* don't need to look any further.	270	* don't need to look any further.
…		…
281		278
282	/* Find the topmost object at this spot */	279	/* Find the topmost object at this spot */
283	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);	280	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
284		281
285	/* For all the stacked objects at this point, attempt a steal */	282	/* For all the stacked objects at this point, attempt a steal */
286	for (; tmp != NULL; tmp = next)	283	for (; tmp; tmp = next)
287	{	284	{
288	next = tmp->below;	285	next = tmp->below;
289	/* Minor hack--for multi square beings - make sure we get	286	/* Minor hack--for multi square beings - make sure we get
290	* the 'head' coz 'tail' objects have no inventory! - b.t.	287	* the 'head' coz 'tail' objects have no inventory! - b.t.
291	*/	288	*/
…		…
296	continue;	293	continue;
297		294
298	/* do not reveal hidden DMs */	295	/* do not reveal hidden DMs */
299	if (tmp->type == PLAYER && QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)	296	if (tmp->type == PLAYER && QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)
300	continue;	297	continue;
		298
301	if (attempt_steal (tmp, op, skill))	299	if (attempt_steal (tmp, op, skill))
302	{	300	{
303	if (tmp->type == PLAYER) /* no xp for stealing from another player */	301	if (tmp->type == PLAYER) /* no xp for stealing from another player */
304	return 0;	302	return 0;
305		303
306	/* no xp for stealing from pets (of players) */	304	/* no xp for stealing from pets (of players) */
307	if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)	305	if (QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->attack_movement == PETMOVE)
308	{	306	{
309	object *owner = tmp->owner;	307	object *owner = tmp->owner;
310		308
311	if (owner != NULL && owner->type == PLAYER)	309	if (owner && owner->type == PLAYER)
312	return 0;	310	return 0;
313	}	311	}
314		312
315	// reduce monster experience by experience we gained, as to	313	// reduce monster experience by experience we gained, as to
316	// limit the amount of exp that can be gained by stealing from monsters	314	// limit the amount of exp that can be gained by stealing from monsters
317	// (jessies gave ~20,000,000 exp otherwise.	315	// (jessies gave ~20,000,000 exp otherwise.
318	int exp = calc_skill_exp (op, tmp, skill);	316	int exp = calc_skill_exp (op, tmp, skill);
319		317
320	exp = MIN (tmp->stats.exp, exp);	318	exp = min (tmp->stats.exp, exp);
321	tmp->stats.exp -= exp;	319	tmp->stats.exp -= exp;
322	return exp;	320	return exp;
323	}	321	}
324	}	322	}
		323
325	return 0;	324	return 0;
326	}	325	}
327		326
328	static int	327	static int
329	attempt_pick_lock (object door, object pl, object *skill)	328	attempt_pick_lock (object door, object pl, object *skill)
…		…
482	static void	481	static void
483	stop_jump (object *pl, int dist, int spaces)	482	stop_jump (object *pl, int dist, int spaces)
484	{	483	{
485	pl->update_stats ();	484	pl->update_stats ();
486	pl->map->insert (pl, pl->x, pl->y, pl);	485	pl->map->insert (pl, pl->x, pl->y, pl);
487	pl->speed_left -= fabs (pl->speed * 8);	486	pl->speed_left -= pl->speed * 8.;
488	}	487	}
489		488
490	static int	489	static int
491	attempt_jump (object pl, int dir, int spaces, object skill)	490	attempt_jump (object pl, int dir, int spaces, object skill)
492	{	491	{
…		…
790	use_oratory (object pl, int dir, object skill)	789	use_oratory (object pl, int dir, object skill)
791	{	790	{
792	if (pl->type != PLAYER)	791	if (pl->type != PLAYER)
793	return 0; /* only players use this skill */	792	return 0; /* only players use this skill */
794		793
		794	if (!dir)
		795	{
		796	pl->failmsg ("In what direction?");
		797	return 0;
		798	}
		799
795	sint16 x = pl->x + freearr_x[dir],	800	sint16 x = pl->x + freearr_x[dir],
796	y = pl->y + freearr_y[dir];	801	y = pl->y + freearr_y[dir];
797	maptile *m = pl->map;	802	maptile *m = pl->map;
798		803
799	int mflags = get_map_flags (m, &m, x, y, &x, &y);	804	int mflags = get_map_flags (m, &m, x, y, &x, &y);
…		…
924	sint16 x, y;	929	sint16 x, y;
925		930
926	if (pl->type != PLAYER)	931	if (pl->type != PLAYER)
927	return 0; /* only players use this skill */	932	return 0; /* only players use this skill */
928		933
		934	if (!dir)
		935	{
		936	pl->failmsg ("In what direction?");
		937	return 0;
		938	}
		939
929	new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing.");	940	new_draw_info_format (NDI_UNIQUE, 0, pl, "You sing.");
930	for (i = 0; i < MIN (skill->level, SIZEOFFREE); i++)	941	for (int i = skill->level >= SIZEOFFREE1 ? 0 : dir;
		942	i < min (skill->level, SIZEOFFREE);
		943	i++)
931	{	944	{
932	x = pl->x + freearr_x[i];	945	x = pl->x + freearr_x[i];
933	y = pl->y + freearr_y[i];	946	y = pl->y + freearr_y[i];
934	m = pl->map;	947	m = pl->map;
935		948
…		…
986	}	999	}
987		1000
988	/* The find_traps skill (aka, search). Checks for traps	1001	/* The find_traps skill (aka, search). Checks for traps
989	* on the spaces or in certain objects	1002	* on the spaces or in certain objects
990	*/	1003	*/
991
992	int	1004	int
993	find_traps (object pl, object skill)	1005	find_traps (object pl, object skill)
994	{	1006	{
995	object tmp, tmp2;	1007	object tmp, tmp2;
996	int i, expsum = 0, mflags;	1008	int i, expsum = 0, mflags;
…		…
998	maptile *m;	1010	maptile *m;
999		1011
1000	/* First we search all around us for runes and traps, which are	1012	/* First we search all around us for runes and traps, which are
1001	* all type RUNE	1013	* all type RUNE
1002	*/	1014	*/
1003
1004	for (i = 0; i < 9; i++)	1015	for (i = 0; i < 9; i++)
1005	{	1016	{
1006	x = pl->x + freearr_x[i];	1017	x = pl->x + freearr_x[i];
1007	y = pl->y + freearr_y[i];	1018	y = pl->y + freearr_y[i];
1008	m = pl->map;	1019	m = pl->map;
…		…
1010	mflags = get_map_flags (m, &m, x, y, &x, &y);	1021	mflags = get_map_flags (m, &m, x, y, &x, &y);
1011	if (mflags & P_OUT_OF_MAP)	1022	if (mflags & P_OUT_OF_MAP)
1012	continue;	1023	continue;
1013		1024
1014	/* Check everything in the square for trapness */	1025	/* Check everything in the square for trapness */
1015	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1026	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1016	{	1027	{
1017
1018	/* And now we'd better do an inventory traversal of each	1028	/* And now we'd better do an inventory traversal of each
1019	* of these objects' inventory	1029	* of these objects' inventory
1020	* We can narrow this down a bit - no reason to search through	1030	* We can narrow this down a bit - no reason to search through
1021	* the players inventory or monsters for that matter.	1031	* the players inventory or monsters for that matter.
1022	*/	1032	*/
1023	if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER))	1033	if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER))
1024	{
1025	for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)	1034	for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)
1026	if (tmp2->type == RUNE \|\| tmp2->type == TRAP)	1035	if (tmp2->type == RUNE \|\| tmp2->type == TRAP)
1027	if (trap_see (pl, tmp2))	1036	if (trap_see (pl, tmp2))
1028	{	1037	{
1029	trap_show (tmp2, tmp);	1038	trap_show (tmp2, tmp);
1030	if (tmp2->stats.Cha > 1)	1039	if (tmp2->stats.Cha > 1)
1031	{	1040	{
1032	if (!tmp2->owner \|\| tmp2->owner->type != PLAYER)	1041	if (!tmp2->owner \|\| tmp2->owner->type != PLAYER)
1033	expsum += calc_skill_exp (pl, tmp2, skill);	1042	expsum += calc_skill_exp (pl, tmp2, skill);
1034		1043
1035	tmp2->stats.Cha = 1; /* unhide the trap */	1044	tmp2->stats.Cha = 1; /* unhide the trap */
1036	}	1045	}
1037	}	1046	}
1038	}	1047
1039	if ((tmp->type == RUNE \|\| tmp->type == TRAP) && trap_see (pl, tmp))	1048	if ((tmp->type == RUNE \|\| tmp->type == TRAP) && trap_see (pl, tmp))
1040	{	1049	{
1041	trap_show (tmp, tmp);	1050	trap_show (tmp, tmp);
1042	if (tmp->stats.Cha > 1)	1051	if (tmp->stats.Cha > 1)
1043	{	1052	{
…		…
1046	tmp->stats.Cha = 1; /* unhide the trap */	1055	tmp->stats.Cha = 1; /* unhide the trap */
1047	}	1056	}
1048	}	1057	}
1049	}	1058	}
1050	}	1059	}
		1060
1051	new_draw_info (NDI_BLACK, 0, pl, "You search the area.");	1061	new_draw_info (NDI_BLACK, 0, pl, "You search the area.");
1052	return expsum;	1062	return expsum;
1053	}	1063	}
1054		1064
1055	/* remove_trap() - This skill will disarm any previously discovered trap	1065	/* remove_trap() - This skill will disarm any previously discovered trap
…		…
1240		1250
1241	STRLEN char_len = utf8_length ((U8 )msg, (U8 )(msg+len));	1251	STRLEN char_len = utf8_length ((U8 )msg, (U8 )(msg+len));
1242		1252
1243	if (char_len <= item->weight_limit)	1253	if (char_len <= item->weight_limit)
1244	{	1254	{
1245	object *newbook = arch_to_object (item->other_arch);	1255	object *newbook = item->other_arch->instance ();
1246	item->decrease ();	1256	item->decrease ();
1247	newbook->nrof = 1;	1257	newbook->nrof = 1;
1248	newbook->msg = shstr (msg);	1258	newbook->msg = shstr (msg);
1249	newbook->flag [FLAG_IDENTIFIED] = true;	1259	newbook->flag [FLAG_IDENTIFIED] = true;
1250		1260
…		…
1306	pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);	1316	pl->stats.grace -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_GRACE);
1307	pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);	1317	pl->stats.sp -= SP_level_spellpoint_cost (pl, chosen_spell, SPELL_MANA);
1308		1318
1309	if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)	1319	if (random_roll (0, chosen_spell->level * 4 - 1, pl, PREFER_LOW) < skill->level)
1310	{	1320	{
1311	object *newscroll = arch_to_object (scroll->other_arch);	1321	object *newscroll = scroll->other_arch->instance ();
1312	scroll->decrease ();	1322	scroll->decrease ();
1313	newscroll->nrof = 1;	1323	newscroll->nrof = 1;
1314		1324
1315	pl->contr->play_sound (sound_find ("inscribe_success"));	1325	pl->contr->play_sound (sound_find ("inscribe_success"));
1316		1326
1317	if (!confused)	1327	if (!confused)
1318	{	1328	{
1319	newscroll->level = MAX (skill->level, chosen_spell->level);	1329	newscroll->level = max (skill->level, chosen_spell->level);
1320	newscroll->flag [FLAG_IDENTIFIED] = true;	1330	newscroll->flag [FLAG_IDENTIFIED] = true;
1321	new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");	1331	new_draw_info (NDI_UNIQUE, 0, pl, "You succeed in writing the spell.");
1322	}	1332	}
1323	else	1333	else
1324	{	1334	{
1325	chosen_spell = find_random_spell_in_ob (pl, NULL);	1335	chosen_spell = find_random_spell_in_ob (pl, NULL);
1326	if (!chosen_spell)	1336	if (!chosen_spell)
1327	return 0;	1337	return 0;
1328		1338
1329	newscroll->level = MAX (skill->level, chosen_spell->level);	1339	newscroll->level = max (skill->level, chosen_spell->level);
1330	new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");	1340	new_draw_info (NDI_UNIQUE, 0, pl, "In your confused state, you write down some odd spell.");
1331	}	1341	}
1332		1342
1333	object *tmp = chosen_spell->clone ();	1343	object *tmp = chosen_spell->clone ();
1334	insert_ob_in_ob (tmp, newscroll);	1344	insert_ob_in_ob (tmp, newscroll);
…		…
1352	{ /* Inscription has failed */	1362	{ /* Inscription has failed */
1353	pl->contr->play_sound (sound_find ("inscribe_fail"));	1363	pl->contr->play_sound (sound_find ("inscribe_fail"));
1354		1364
1355	if (chosen_spell->level > skill->level \|\| confused)	1365	if (chosen_spell->level > skill->level \|\| confused)
1356	{ /backfire! /	1366	{ /backfire! /
1357	new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind!");	1367	new_draw_info (NDI_UNIQUE, 0, pl, "Ouch! Your attempt to write a new scroll strains your mind! H<The spell level is too high for your inscription skill.>");
1358		1368
1359	if (random_roll (0, 1, pl, PREFER_LOW) == 1)	1369	if (random_roll (0, 1, pl, PREFER_LOW) == 1)
1360	pl->drain_specific_stat (4);	1370	pl->drain_specific_stat (4);
1361	else	1371	else
1362	{	1372	{
…		…
1830	else	1840	else
1831	throw_ob = find_mon_throw_ob (op);	1841	throw_ob = find_mon_throw_ob (op);
1832		1842
1833	return do_throw (op, part, throw_ob, dir, skill);	1843	return do_throw (op, part, throw_ob, dir, skill);
1834	}	1844	}
		1845
		1846	bool
		1847	skill_mining (object who, object tool, object skill, int dir, const char string)
		1848	{
		1849	printf ("******** mining\n");
		1850	return false;
		1851	}
		1852
		1853	bool
		1854	skill_fishing (object who, object tool, object skill, int dir, const char string)
		1855	{
		1856	printf ("******** fishing\n");
		1857	return false;
		1858	}

Diff Legend

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

Comparing deliantra/server/server/skills.C (file contents): Revision 1.71 by root, Sat Nov 7 13:58:01 2009 UTC vs. Revision 1.81 by root, Sun Apr 4 04:10:47 2010 UTC

Diff Legend

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.71 by root, Sat Nov 7 13:58:01 2009 UTC vs.
Revision 1.81 by root, Sun Apr 4 04:10:47 2010 UTC