[ViewVC] Diff of: cvs/deliantra/server/server/skill

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.35 by root, Tue May 1 05:48:20 2007 UTC vs.
Revision 1.47 by root, Sun May 13 19:56:57 2007 UTC

…		…
115	* tool, this code will equip it.	115	* tool, this code will equip it.
116	*/	116	*/
117	object *	117	object *
118	find_skill_by_name (object who, const char name)	118	find_skill_by_name (object who, const char name)
119	{	119	{
120	object skill = NULL, skill_tool = NULL, *tmp;
121
122	if (!name)	120	if (!name)
123	return NULL;	121	return 0;
		122
		123	object skill = 0, skill_tool = 0;
124		124
125	/* We make sure the length of the string in the object is greater	125	/* We make sure the length of the string in the object is greater
126	* in length than the passed string. Eg, if we have a skill called	126	* in length than the passed string. Eg, if we have a skill called
127	* 'hi', we don't want to match if the user passed 'high'	127	* 'hi', we don't want to match if the user passed 'high'
128	*/	128	*/
129	for (tmp = who->inv; tmp != NULL; tmp = tmp->below)	129	for (object *tmp = who->inv; tmp; tmp = tmp->below)
130	{	130	{
131	if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name))	131	if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && strlen (tmp->skill) >= strlen (name))
132	skill = tmp;	132	skill = tmp;
133		133
134	/* Try to find appropriate skilltool. If the player has one already	134	/* Try to find appropriate skilltool. If the player has one already
135	* applied, we try to keep using that one.	135	* applied, we try to keep using that one.
136	*/	136	*/
137	else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name))	137	else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && strlen (tmp->skill) >= strlen (name))
138	{	138	{
139	if (QUERY_FLAG (tmp, FLAG_APPLIED))	139	if (QUERY_FLAG (tmp, FLAG_APPLIED))
140	skill_tool = tmp;	140	skill_tool = tmp;
141	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))	141	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))
142	skill_tool = tmp;	142	skill_tool = tmp;
143	}	143	}
144	}	144	}
		145
145	/* If this is a skill that can be used without a tool, return it */	146	/* If this is a skill that can be used without a tool, return it */
146	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))	147	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
147	return skill;	148	return skill;
148		149
149	/* Player has a tool to use the skill. IF not applied, apply it -	150	/* Player has a tool to use the skill. If not applied, apply it -
150	* if not successful, return null. If they do have the skill tool	151	* if not successful, return null. If they do have the skill tool
151	* but not the skill itself, give it to them.	152	* but not the skill itself, give it to them.
152	*/	153	*/
153	if (skill_tool)	154	if (skill_tool)
154	{	155	{
155	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))	156	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
156	{
157	if (apply_special (who, skill_tool, 0))	157	if (apply_special (who, skill_tool, 0))
158	return NULL;	158	return 0;
159	}
160		159
161	if (!skill)	160	if (!skill)
162	{	161	{
163	skill = give_skill_by_name (who, skill_tool->skill);	162	skill = give_skill_by_name (who, skill_tool->skill);
164	link_player_skills (who);	163	link_player_skills (who);
165	}	164	}
166		165
167	return skill;	166	return skill;
168	}	167	}
169		168
170	return NULL;	169	return 0;
171	}	170	}
172
173		171
174	/* This returns the skill pointer of the given name (the	172	/* This returns the skill pointer of the given name (the
175	* one that accumlates exp, has the level, etc).	173	* one that accumlates exp, has the level, etc).
176	*	174	*
177	* It is presumed that the player will be needing to actually	175	* It is presumed that the player will be needing to actually
…		…
183	* this replaces find_skill.	181	* this replaces find_skill.
184	*/	182	*/
185	object *	183	object *
186	find_skill_by_number (object *who, int skillno)	184	find_skill_by_number (object *who, int skillno)
187	{	185	{
		186	if (!IN_RANGE_EXC (skillno, 1, NUM_SKILLS))
		187	return 0;
		188
188	object skill = NULL, skill_tool = NULL, *tmp;	189	object skill = NULL, skill_tool = NULL;
189		190
190	if (skillno < 1 \|\| skillno >= NUM_SKILLS)
191	return NULL;
192
193	for (tmp = who->inv; tmp != NULL; tmp = tmp->below)	191	for (object *tmp = who->inv; tmp; tmp = tmp->below)
194	{	192	{
195	if (tmp->type == SKILL && tmp->subtype == skillno)	193	if (tmp->type == SKILL && tmp->subtype == skillno)
196	skill = tmp;	194	skill = tmp;
197		195
198	/* Try to find appropriate skilltool. If the player has one already	196	/* Try to find appropriate skilltool. If the player has one already
…		…
204	skill_tool = tmp;	202	skill_tool = tmp;
205	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))	203	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))
206	skill_tool = tmp;	204	skill_tool = tmp;
207	}	205	}
208	}	206	}
		207
209	/* If this is a skill that can be used without a tool, return it */	208	/* If this is a skill that can be used without a tool, return it */
210	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))	209	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
211	return skill;	210	return skill;
212		211
213	/* Player has a tool to use the skill. IF not applied, apply it -	212	/* Player has a tool to use the skill. If not applied, apply it -
214	* if not successful, return null. If they do have the skill tool	213	* if not successful, return null. If they do have the skill tool
215	* but not the skill itself, give it to them.	214	* but not the skill itself, give it to them.
216	*/	215	*/
217	if (skill_tool)	216	if (skill_tool)
218	{	217	{
219	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))	218	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
…		…
235	}	234	}
236		235
237	/* This changes the objects skill to new_skill.	236	/* This changes the objects skill to new_skill.
238	* note that this function doesn't always need to get used -	237	* note that this function doesn't always need to get used -
239	* you can now add skill exp to the player without the chosen_skill being	238	* you can now add skill exp to the player without the chosen_skill being
240	* set. This function is of most interest to players to update	239	* set. This function is of most interest to players to update
241	* the various range information.	240	* the various range information.
242	* if new_skill is null, this just unapplies the skill.
243	* flag has the current meaning:
244	* 0x1: If set, don't update the range pointer. This is useful when we
245	* need to ready a new skill, but don't want to clobber range.
246	* return 1 on success, 0 on error	241	* return 1 on success, 0 on error
247	*/	242	*/
248	int	243	int
249	change_skill (object who, object new_skill, int flag)	244	change_skill (object who, object new_skill, int flag)
250	{	245	{
251	if (who->type != PLAYER)	246	if (who->type != PLAYER)
252	return 0;	247	return 0;
		248
		249	#if 0
		250	// optimise this supposedly common case
		251	if (new_skill == who->chosen_skill)
		252	return 1;
		253	#endif
253		254
254	if (!new_skill)	255	if (!new_skill)
255	{	256	{
256	LOG (llevError \| logBacktrace, "change_skill called on %s with NULL skill\n",	257	LOG (llevError \| logBacktrace, "change_skill called on %s with NULL skill\n",
257	who->debug_desc ());	258	who->debug_desc ());
258	return 0;	259	return 0;
259	}	260	}
260		261
261	player *pl = who->contr;	262	// the skill could be readied already because it is used by a weapon.
262		263	who->change_weapon (0);
263	// move skill to front, so it will be preferred next time	264	new_skill->inv_splay ();
264	new_skill->remove ();
265	who->insert (new_skill);
266		265
267	if (apply_special (who, new_skill, AP_APPLY))	266	if (apply_special (who, new_skill, AP_APPLY))
268	return 0;	267	return 0;
269		268
270	return 1;	269	return 1;
…		…
278	{	277	{
279	who->chosen_skill = 0;	278	who->chosen_skill = 0;
280	CLEAR_FLAG (who, FLAG_READY_SKILL);	279	CLEAR_FLAG (who, FLAG_READY_SKILL);
281		280
282	if (who->type == PLAYER)	281	if (who->type == PLAYER)
283	{
284	if (who->contr->ranged_ob && who->contr->ranged_ob->type == SKILL)	282	if (who->contr->ranged_ob && who->contr->ranged_ob->type == SKILL)
285	who->contr->ranged_ob = 0;	283	who->contr->ranged_ob = 0;
286	}
287	}	284	}
288		285
289	/* do_skill() - Main skills use function-similar in scope to cast_spell().	286	/* do_skill() - Main skills use function-similar in scope to cast_spell().
290	* We handle all requests for skill use outside of some combat here.	287	* We handle all requests for skill use outside of some combat here.
291	* We require a separate routine outside of fire() so as to allow monsters	288	* We require a separate routine outside of fire() so as to allow monsters
…		…
299	int	296	int
300	do_skill (object op, object part, object skill, int dir, const char string)	297	do_skill (object op, object part, object skill, int dir, const char string)
301	{	298	{
302	int success = 0, exp = 0;	299	int success = 0, exp = 0;
303	int did_alc = 0;	300	int did_alc = 0;
304	object tmp, next;
305		301
306	if (!skill)	302	if (!skill)
307	return 0;	303	return 0;
308		304
309	/* The code below presumes that the skill points to the object that	305	/* The code below presumes that the skill points to the object that
…		…
311	* go and try to find the actual real skill pointer, and if the	307	* go and try to find the actual real skill pointer, and if the
312	* the player doesn't have a bucket for that, create one.	308	* the player doesn't have a bucket for that, create one.
313	*/	309	*/
314	if (skill->type != SKILL && op->type == PLAYER)	310	if (skill->type != SKILL && op->type == PLAYER)
315	{	311	{
316	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	312	for (object *tmp = op->inv; tmp; tmp = tmp->below)
317	if (tmp->type == SKILL && tmp->skill == skill->skill)	313	if (tmp->type == SKILL && tmp->skill == skill->skill)
318	break;	314	{
		315	skill = tmp;
		316	goto found;
		317	}
319		318
320	if (!tmp)
321	tmp = give_skill_by_name (op, skill->skill);	319	skill = give_skill_by_name (op, skill->skill);
322		320	found: ;
323	skill = tmp;
324	}	321	}
325		322
326	// skill, by_whom, on_which_object, which direction, skill_argument	323	// skill, by_whom, on_which_object, which direction, skill_argument
327	if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))	324	if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
328	return 0;	325	return 0;
…		…
433	case SK_LITERACY:	430	case SK_LITERACY:
434	case SK_WOODSMAN:	431	case SK_WOODSMAN:
435	/* first, we try to find a cauldron, and do the alchemy thing.	432	/* first, we try to find a cauldron, and do the alchemy thing.
436	* failing that, we go and identify stuff.	433	* failing that, we go and identify stuff.
437	*/	434	*/
438	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next)	435	for (object next, tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
439	{	436	{
440	next = tmp->above;	437	next = tmp->above;
441		438
442	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))	439	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
443	{	440	{
…		…
504	* If certain skills should take more/less time, that should be	501	* If certain skills should take more/less time, that should be
505	* in the code for the skill itself.	502	* in the code for the skill itself.
506	*/	503	*/
507		504
508	if (op->type == PLAYER)	505	if (op->type == PLAYER)
509	op->speed_left -= 1.0;	506	op->speed_left -= 1.f;
510		507
511	/* this is a good place to add experience for successfull use of skills.	508	/* this is a good place to add experience for successfull use of skills.
512	* Note that add_exp() will figure out player/monster experience	509	* Note that add_exp() will figure out player/monster experience
513	* gain problems.	510	* gain problems.
514	*/	511	*/
…		…
685	link_player_skills (pl);	682	link_player_skills (pl);
686	return 1;	683	return 1;
687	}	684	}
688		685
689	/* Gives a percentage clipped to 0% -> 100% of a/b. */	686	/* Gives a percentage clipped to 0% -> 100% of a/b. */
690
691	/* Probably belongs in some global utils-type file? */	687	/* Probably belongs in some global utils-type file? */
692	static int	688	static int
693	clipped_percent (sint64 a, sint64 b)	689	clipped_percent (sint64 a, sint64 b)
694	{	690	{
695	int rv;	691	int rv;
…		…
788	* direction that the user is facing. Returns false if we are unable to	784	* direction that the user is facing. Returns false if we are unable to
789	* change to the requested skill, or were unable to use the skill properly.	785	* change to the requested skill, or were unable to use the skill properly.
790	* This is tricky because skills can have spaces. We basically roll	786	* This is tricky because skills can have spaces. We basically roll
791	* our own find_skill_by_name so we can try to do better string matching.	787	* our own find_skill_by_name so we can try to do better string matching.
792	*/	788	*/
793
794	int	789	int
795	use_skill (object op, const char string)	790	use_skill (object op, const char string)
796	{	791	{
797	object *skop;	792	object *skop;
798	size_t len;	793	size_t len;
…		…
924	}	919	}
925		920
926	/* now try to ready the new skill */	921	/* now try to ready the new skill */
927	if (!change_skill (op, skill, 0))	922	if (!change_skill (op, skill, 0))
928	{ /* oh oh, trouble! */	923	{ /* oh oh, trouble! */
929	new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name);	924	new_draw_info_format (NDI_UNIQUE, 0, op, "Couldn't change to skill %s", &skill->name);
930	return 0;	925	return 0;
931	}	926	}
932	}	927	}
933		928
934	if (!pl->combat_ob)	929	if (!pl->combat_ob)
…		…
936	LOG (llevError, "Could not find anything to attack on %s\n", &op->name);	931	LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
937	return 0;	932	return 0;
938	}	933	}
939	}	934	}
940		935
941	if (op->current_weapon != pl->combat_ob)	936	if (!op->change_weapon (pl->combat_ob))
942	{	937	return 0;
943	op->current_weapon = pl->combat_ob;
944	op->update_stats ();
945	}
946		938
947	/* lose invisiblity/hiding status for running attacks */	939	/* lose invisiblity/hiding status for running attacks */
948
949	if (pl->tmp_invis)	940	if (pl->tmp_invis)
950	{	941	{
951	pl->tmp_invis = 0;	942	pl->tmp_invis = 0;
952	op->invisible = 0;	943	op->invisible = 0;
953	op->hide = 0;	944	op->hide = 0;
…		…
1031	}	1022	}
1032		1023
1033	return do_skill_attack (tmp, pl, string, skill);	1024	return do_skill_attack (tmp, pl, string, skill);
1034	}	1025	}
1035		1026
1036
1037	/* attack_hth() - this handles all hand-to-hand attacks -b.t. */	1027	/* attack_hth() - this handles all hand-to-hand attacks -b.t. */
1038		1028
1039	/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first	1029	/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first
1040	* (attack_hth) we check for weapon use, etc in the second (the new	1030	* (attack_hth) we check for weapon use, etc in the second (the new
1041	* function skill_attack() we actually attack.	1031	* function skill_attack() we actually attack.
1042	*/	1032	*/
1043
1044	static int	1033	static int
1045	attack_hth (object pl, int dir, const char string, object *skill)	1034	attack_hth (object pl, int dir, const char string, object *skill)
1046	{	1035	{
1047	object enemy = NULL, weapon;	1036	object enemy = NULL, weapon;
1048		1037
…		…
1057	if (pl->type == PLAYER)	1046	if (pl->type == PLAYER)
1058	{	1047	{
1059	new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");	1048	new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1060	esrv_update_item (UPD_FLAGS, pl, weapon);	1049	esrv_update_item (UPD_FLAGS, pl, weapon);
1061	}	1050	}
		1051
1062	break;	1052	break;
1063	}	1053	}
1064	}	1054	}
1065		1055
1066	return skill_attack (enemy, pl, dir, string, skill);	1056	return skill_attack (enemy, pl, dir, string, skill);

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.35 by root, Tue May 1 05:48:20 2007 UTC vs. Revision 1.47 by root, Sun May 13 19:56:57 2007 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.35 by root, Tue May 1 05:48:20 2007 UTC vs.
Revision 1.47 by root, Sun May 13 19:56:57 2007 UTC