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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.37 by root, Thu May 3 09:39:56 2007 UTC vs.
Revision 1.61 by root, Tue May 6 16:32:34 2008 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copryight (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/* Created July 95 to separate skill utilities from actual skills -b.t. */	24	/* Created July 95 to separate skill utilities from actual skills -b.t. */
26		25
27	/* Reconfigured skills code to allow linking of skills to experience	26	/* Reconfigured skills code to allow linking of skills to experience
61	* subtypes.	60	* subtypes.
62	*/	61	*/
63	void	62	void
64	init_skills (void)	63	init_skills (void)
65	{	64	{
66	for (archetype *at = first_archetype; at; at = at->next)	65	for_all_archetypes (at)
67	if (at->clone.type == SKILL)	66	if (at->type == SKILL)
68	{	67	{
69	if (skill_names[at->clone.subtype])	68	if (skill_names[at->subtype])
70	LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",	69	LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",
71	at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill);	70	at->subtype, &skill_names[at->subtype], &at->skill);
72	else	71	else
73	skill_names[at->clone.subtype] = at->clone.skill;	72	skill_names[at->subtype] = at->skill;
74	}	73	}
75		74
76	/* This isn't really an error if there is no skill subtype set, but	75	/* This isn't really an error if there is no skill subtype set, but
77	* checking for this may catch some user errors.	76	* checking for this may catch some user errors.
78	*/	77	*/
…		…
105	op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go	104	op->contr->ns->last_skill_exp[tmp->subtype] = -1; //TODO: this should go
106	}	105	}
107	}	106	}
108	}	107	}
109		108
		109	static object *
		110	find_skill (object *who, const shstr &sh)
		111	{
		112	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		113	if (tmp->skill == sh && tmp->type == SKILL)
		114	return tmp;
		115
		116	return 0;
		117	}
		118
110	/* This returns the skill pointer of the given name (the	119	/* This returns the skill pointer of the given name (the
111	* one that accumlates exp, has the level, etc).	120	* one that accumulates exp, has the level, etc).
112	*	121	*
113	* It is presumed that the player will be needing to actually	122	* It is presumed that the player will be needing to actually
114	* use the skill, so thus if use of the skill requires a skill	123	* use the skill, so thus if use of the skill requires a skill
115	* tool, this code will equip it.	124	* tool, this code will equip it.
116	*/	125	*/
117	object *	126	object *
118	find_skill_by_name (object who, const char name)	127	find_skill_by_name (object *who, const shstr &sh)
119	{	128	{
120	object skill = NULL, skill_tool = NULL, *tmp;	129	object *skill_tool = 0;
121		130
122	if (!name)
123	return NULL;
124
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
127	* 'hi', we don't want to match if the user passed 'high'
128	*/
129	for (tmp = who->inv; tmp != NULL; tmp = tmp->below)	131	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		132	if (tmp->skill == sh)
130	{	133	{
131	if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name))	134	if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] \|\| tmp->flag [FLAG_APPLIED]))
132	skill = tmp;	135	/* If this is a skill that can be used without applying tool, return it */
133		136	return splay (tmp);
134	/* Try to find appropriate skilltool. If the player has one already	137	/* Try to find appropriate skilltool. If the player has one already
135	* applied, we try to keep using that one.	138	* applied, we try to keep using that one.
136	*/	139	*/
137	else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name))	140	else if (tmp->type == SKILL_TOOL && !skill_tool)
138	{
139	if (QUERY_FLAG (tmp, FLAG_APPLIED))
140	skill_tool = tmp;	141	skill_tool = tmp;
141	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))
142	skill_tool = tmp;
143	}	142	}
144	}	143
145	/* If this is a skill that can be used without a tool, return it */	144	if (!skill_tool)
146	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
147	return skill;	145	return 0;
148		146
149	/* Player has a tool to use the skill. IF not applied, apply it -	147	/* 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	148	* if not successful, return null. If they do have the skill tool
151	* but not the skill itself, give it to them.	149	* but not the skill itself, give it to them.
152	*/	150	*/
153	if (skill_tool)	151	object *skill = find_skill (who, skill_tool->skill);
154	{
155	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
156	{
157	if (apply_special (who, skill_tool, 0))
158	return NULL;
159	}
160		152
161	if (!skill)	153	if (!skill)
162	{	154	{
163	skill = give_skill_by_name (who, skill_tool->skill);	155	skill = give_skill_by_name (who, skill_tool->skill);
164	link_player_skills (who);	156	link_player_skills (who);
165	}	157	}
166		158
		159	if (!skill_tool->flag [FLAG_APPLIED])
		160	if (apply_special (who, splay (skill_tool), AP_APPLY \| AP_NO_READY))
167	return skill;	161	return 0;
168	}
169		162
		163	return splay (skill);
		164	}
		165
		166	object *
		167	find_skill_by_name (object who, const char name)
		168	{
		169	if (!name)
		170	return 0;
		171
		172	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		173	if ((tmp->type == SKILL \|\| tmp->type == SKILL_TOOL)
		174	&& tmp->skill.begins_with (name))
		175	if (object *skop = find_skill_by_name (who, tmp->skill))
		176	return skop;
		177
170	return NULL;	178	return 0;
171	}	179	}
172
173		180
174	/* This returns the skill pointer of the given name (the	181	/* This returns the skill pointer of the given name (the
175	* one that accumlates exp, has the level, etc).	182	* one that accumulates exp, has the level, etc).
176	*	183	*
177	* It is presumed that the player will be needing to actually	184	* It is presumed that the player will be needing to actually
178	* use the skill, so thus if use of the skill requires a skill	185	* use the skill, so thus if use of the skill requires a skill
179	* tool, this code will equip it.	186	* tool, this code will equip it.
180	*	187	*
…		…
183	* this replaces find_skill.	190	* this replaces find_skill.
184	*/	191	*/
185	object *	192	object *
186	find_skill_by_number (object *who, int skillno)	193	find_skill_by_number (object *who, int skillno)
187	{	194	{
188	object skill = NULL, skill_tool = NULL, *tmp;
189
190	if (skillno < 1 \|\| skillno >= NUM_SKILLS)
191	return NULL;
192
193	for (tmp = who->inv; tmp != NULL; tmp = tmp->below)	195	for (object *tmp = who->inv; tmp; tmp = tmp->below)
194	{
195	if (tmp->type == SKILL && tmp->subtype == skillno)	196	if (tmp->type == SKILL && tmp->subtype == skillno)
196	skill = tmp;	197	if (object *skop = find_skill_by_name (who, tmp->skill))
197
198	/* Try to find appropriate skilltool. If the player has one already
199	* applied, we try to keep using that one.
200	*/
201	else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno)
202	{
203	if (QUERY_FLAG (tmp, FLAG_APPLIED))
204	skill_tool = tmp;
205	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))
206	skill_tool = tmp;
207	}
208	}
209	/* If this is a skill that can be used without a tool, return it */
210	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
211	return skill;
212
213	/* 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
215	* but not the skill itself, give it to them.
216	*/
217	if (skill_tool)
218	{
219	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
220	{
221	if (apply_special (who, skill_tool, 0))
222	return NULL;
223	}
224
225	if (!skill)
226	{
227	skill = give_skill_by_name (who, skill_tool->skill);
228	link_player_skills (who);
229	}
230
231	return skill;	198	return skop;
232	}
233		199
234	return NULL;	200	return 0;
235	}	201	}
236		202
237	/* This changes the objects skill to new_skill.	203	/* This changes the objects chosen_skill to new_skill.
238	* 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
240	* set. This function is of most interest to players to update
241	* the various range information.
242	* return 1 on success, 0 on error	204	* return 1 on success, 0 on error
243	*/	205	*/
244	int	206	bool
245	change_skill (object who, object new_skill, int flag)	207	object::change_skill (object *new_skill)
246	{	208	{
247	if (who->type != PLAYER)	209	if (type != PLAYER)
248	return 0;	210	return 0;
249		211
250	if (!new_skill)	212	// optimise this supposedly common case
251	{	213	if (new_skill == chosen_skill)
252	LOG (llevError \| logBacktrace, "change_skill called on %s with NULL skill\n",
253	who->debug_desc ());
254	return 0;
255	}
256
257	player *pl = who->contr;
258
259	// move skill to front, so it will be preferred next time
260	new_skill->remove ();
261	who->insert (new_skill);
262
263	if (apply_special (who, new_skill, AP_APPLY))
264	return 0;	214	return 1;
265		215
		216	if (chosen_skill)
		217	{
		218	chosen_skill->flag [FLAG_APPLIED] = false;
		219	change_abil (this, chosen_skill);
		220	}
		221
		222	chosen_skill = new_skill;
		223
		224	if (chosen_skill)
		225	{
		226	chosen_skill->flag [FLAG_APPLIED] = true;
		227	change_abil (this, chosen_skill);
		228	}
		229
		230	// always clear current weapon, as the selected skill could
		231	// conflict with the current weapon skill, which would go
		232	// undetected and exp would be given to the wrong skill.
		233	current_weapon = 0;
		234
		235	update_stats ();
266	return 1;	236	return 1;
267	}
268
269	/* This function just clears the chosen_skill and range_skill values
270	* in the player.
271	*/
272	void
273	clear_skill (object *who)
274	{
275	who->chosen_skill = 0;
276	CLEAR_FLAG (who, FLAG_READY_SKILL);
277
278	if (who->type == PLAYER)
279	if (who->contr->ranged_ob && who->contr->ranged_ob->type == SKILL)
280	who->contr->ranged_ob = 0;
281	}	237	}
282		238
283	/* do_skill() - Main skills use function-similar in scope to cast_spell().	239	/* do_skill() - Main skills use function-similar in scope to cast_spell().
284	* We handle all requests for skill use outside of some combat here.	240	* We handle all requests for skill use outside of some combat here.
285	* We require a separate routine outside of fire() so as to allow monsters	241	* We require a separate routine outside of fire() so as to allow monsters
…		…
293	int	249	int
294	do_skill (object op, object part, object skill, int dir, const char string)	250	do_skill (object op, object part, object skill, int dir, const char string)
295	{	251	{
296	int success = 0, exp = 0;	252	int success = 0, exp = 0;
297	int did_alc = 0;	253	int did_alc = 0;
298	object tmp, next;
299		254
300	if (!skill)	255	if (!skill)
301	return 0;	256	return 0;
302		257
303	/* The code below presumes that the skill points to the object that	258	/* The code below presumes that the skill points to the object that
…		…
305	* go and try to find the actual real skill pointer, and if the	260	* go and try to find the actual real skill pointer, and if the
306	* the player doesn't have a bucket for that, create one.	261	* the player doesn't have a bucket for that, create one.
307	*/	262	*/
308	if (skill->type != SKILL && op->type == PLAYER)	263	if (skill->type != SKILL && op->type == PLAYER)
309	{	264	{
310	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	265	for (object *tmp = op->inv; tmp; tmp = tmp->below)
311	if (tmp->type == SKILL && tmp->skill == skill->skill)	266	if (tmp->type == SKILL && tmp->skill == skill->skill)
312	break;	267	{
		268	skill = tmp;
		269	goto found;
		270	}
313		271
314	if (!tmp)
315	tmp = give_skill_by_name (op, skill->skill);	272	skill = give_skill_by_name (op, skill->skill);
316		273	found: ;
317	skill = tmp;
318	}	274	}
319		275
320	// skill, by_whom, on_which_object, which direction, skill_argument	276	// skill, by_whom, on_which_object, which direction, skill_argument
321	if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))	277	if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
322	return 0;	278	return 0;
…		…
335	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");	291	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
336	}	292	}
337	else	293	else
338	{	294	{
339	SET_FLAG (skill, FLAG_APPLIED);	295	SET_FLAG (skill, FLAG_APPLIED);
340	new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!.");	296	new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
341	}	297	}
342		298
343	op->update_stats ();	299	op->update_stats ();
344	success = 1;	300	success = 1;
345	break;	301	break;
…		…
427	case SK_LITERACY:	383	case SK_LITERACY:
428	case SK_WOODSMAN:	384	case SK_WOODSMAN:
429	/* first, we try to find a cauldron, and do the alchemy thing.	385	/* first, we try to find a cauldron, and do the alchemy thing.
430	* failing that, we go and identify stuff.	386	* failing that, we go and identify stuff.
431	*/	387	*/
432	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next)	388	for (object next, tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
433	{	389	{
434	next = tmp->above;	390	next = tmp->above;
435		391
436	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))	392	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
437	{	393	{
…		…
498	* If certain skills should take more/less time, that should be	454	* If certain skills should take more/less time, that should be
499	* in the code for the skill itself.	455	* in the code for the skill itself.
500	*/	456	*/
501		457
502	if (op->type == PLAYER)	458	if (op->type == PLAYER)
503	op->speed_left -= 1.0;	459	op->speed_left -= 1.f;
504		460
505	/* this is a good place to add experience for successfull use of skills.	461	/* this is a good place to add experience for successfull use of skills.
506	* Note that add_exp() will figure out player/monster experience	462	* Note that add_exp() will figure out player/monster experience
507	* gain problems.	463	* gain problems.
508	*/	464	*/
…		…
554	* If an object is not alive and magical we set the base exp higher to	510	* If an object is not alive and magical we set the base exp higher to
555	* help out exp awards for skill_ident skills. Also, if	511	* help out exp awards for skill_ident skills. Also, if
556	* an item is type RUNE, we give out exp based on stats.Cha	512	* an item is type RUNE, we give out exp based on stats.Cha
557	* and level (this was the old system) -b.t.	513	* and level (this was the old system) -b.t.
558	*/	514	*/
559
560	if (!op)	515	if (!op)
561	{ /* no item/creature */	516	{ /* no item/creature */
562	op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty;	517	op_lvl = max (1, who->map->difficulty);
563	op_exp = 0;	518	op_exp = 0;
564	}	519	}
565	else if (op->type == RUNE \|\| op->type == TRAP)	520	else if (op->type == RUNE \|\| op->type == TRAP)
566	{ /* all traps. If stats.Cha > 1 we use that	521	{ /* all traps. If stats.Cha > 1 we use that
567	* for the amount of experience */	522	* for the amount of experience */
…		…
571	else	526	else
572	{ /* all other items/living creatures */	527	{ /* all other items/living creatures */
573	op_exp = op->stats.exp;	528	op_exp = op->stats.exp;
574	op_lvl = op->level;	529	op_lvl = op->level;
575	if (!QUERY_FLAG (op, FLAG_ALIVE))	530	if (!QUERY_FLAG (op, FLAG_ALIVE))
576	{ /* for ident/make items */	531	op_lvl += 5 * abs (op->magic); /* for ident/make items */
577	op_lvl += 5 * abs (op->magic);
578	}
579	}	532	}
580		533
581	if (op_lvl < 1)	534	if (op_lvl < 1)
582	op_lvl = 1;	535	op_lvl = 1;
583		536
…		…
591	/* if skill really is a skill, then we can look at the skill archetype for	544	/* if skill really is a skill, then we can look at the skill archetype for
592	* bse reward value (exp) and level multiplier factor.	545	* bse reward value (exp) and level multiplier factor.
593	*/	546	*/
594	if (skill->type == SKILL)	547	if (skill->type == SKILL)
595	{	548	{
596	base += skill->arch->clone.stats.exp;	549	base += skill->arch->stats.exp;
597	if (settings.simple_exp)	550	if (settings.simple_exp)
598	{	551	{
599	if (skill->arch->clone.level)	552	if (skill->arch->level)
600	lvl_mult = (float) skill->arch->clone.level / 100.0;	553	lvl_mult = (float) skill->arch->level / 100.0;
601	else	554	else
602	lvl_mult = 1.0; /* no adjustment */	555	lvl_mult = 1.0; /* no adjustment */
603	}	556	}
604	else	557	else
605	{	558	{
606	if (skill->level)	559	if (skill->level)
607	lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0);	560	lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
608	else	561	else
609	lvl_mult = 1.0;	562	lvl_mult = 1.0;
610	}	563	}
611	}	564	}
612	else	565	else
613	{	566	{
614	/* Don't divide by zero here! */	567	/* Don't divide by zero here! */
615	lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1);	568	lvl_mult = (float) op_lvl / (float) max (1, skill->level);
616	}	569	}
617	}	570	}
618		571
619	/* assemble the exp total, and return value */	572	/* assemble the exp total, and return value */
620		573
…		…
637	* player learns the skill, 2 otherwise.	590	* player learns the skill, 2 otherwise.
638	*/	591	*/
639	int	592	int
640	learn_skill (object pl, object scroll)	593	learn_skill (object pl, object scroll)
641	{	594	{
642	object *tmp;
643
644	if (!scroll->skill)	595	if (!scroll->skill)
645	{	596	{
646	LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);	597	LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
647	return 2;	598	return 2;
648	}	599	}
649		600
650	/* can't use find_skill_by_name because we want skills the player knows	601	object *tmp = find_skill (pl, scroll->skill);
651	* but can't use natively.
652	*/
653
654	for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
655	if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
656	break;
657		602
658	/* player already knows it */	603	/* player already knows it */
659	if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))	604	if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
660	return 0;	605	return 0;
661		606
…		…
679	link_player_skills (pl);	624	link_player_skills (pl);
680	return 1;	625	return 1;
681	}	626	}
682		627
683	/* Gives a percentage clipped to 0% -> 100% of a/b. */	628	/* Gives a percentage clipped to 0% -> 100% of a/b. */
684
685	/* Probably belongs in some global utils-type file? */	629	/* Probably belongs in some global utils-type file? */
686	static int	630	static int
687	clipped_percent (sint64 a, sint64 b)	631	clipped_percent (sint64 a, sint64 b)
688	{	632	{
689	int rv;	633	int rv;
…		…
709	* Note this function is a bit more complicated becauase we	653	* Note this function is a bit more complicated becauase we
710	* we want ot sort the skills before printing them. If we	654	* we want ot sort the skills before printing them. If we
711	* just dumped this as we found it, this would be a bit	655	* just dumped this as we found it, this would be a bit
712	* simpler.	656	* simpler.
713	*/	657	*/
714		658	//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
715	void	659	void
716	show_skills (object op, const char search)	660	show_skills (object op, const char search)
717	{	661	{
718	object *tmp = NULL;	662	object *tmp = NULL;
719	char buf[MAX_BUF];	663	char buf[MAX_BUF];
…		…
721	int i, num_skills_found = 0;	665	int i, num_skills_found = 0;
722	static const char *const periods = "........................................";	666	static const char *const periods = "........................................";
723		667
724	/* Need to have a pointer and use strdup for qsort to work properly */	668	/* Need to have a pointer and use strdup for qsort to work properly */
725	char skills[NUM_SKILLS][MAX_BUF];	669	char skills[NUM_SKILLS][MAX_BUF];
726
727		670
728	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	671	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
729	{	672	{
730	if (tmp->type == SKILL)	673	if (tmp->type == SKILL)
731	{	674	{
…		…
734	/* Basically want to fill this out to 40 spaces with periods */	677	/* Basically want to fill this out to 40 spaces with periods */
735	sprintf (buf, "%s%s", &tmp->name, periods);	678	sprintf (buf, "%s%s", &tmp->name, periods);
736	buf[40] = 0;	679	buf[40] = 0;
737		680
738	if (settings.permanent_exp_ratio)	681	if (settings.permanent_exp_ratio)
739	{
740	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",	682	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
741	buf, tmp->level, tmp->stats.exp,	683	buf, tmp->level, tmp->stats.exp,
742	level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));	684	level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
743	}
744	else	685	else
745	{
746	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",	686	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
747	buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));	687	buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
748	}	688
749	/* I don't know why some characters get a bunch of skills, but	689	/* I don't know why some characters get a bunch of skills, but
750	* it sometimes happens (maybe a leftover from bugier earlier code	690	* it sometimes happens (maybe a leftover from bugier earlier code
751	* and those character are still about). In any case, lets handle	691	* and those character are still about). In any case, lets handle
752	* it so it doesn't crash the server - otherwise, one character may	692	* it so it doesn't crash the server - otherwise, one character may
753	* crash the server numerous times.	693	* crash the server numerous times.
…		…
759	break;	699	break;
760	}	700	}
761	}	701	}
762	}	702	}
763		703
764	clear_win_info (op);
765	new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");	704	new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");
766	if (num_skills_found > 1)	705	if (num_skills_found > 1)
767	qsort (skills, num_skills_found, MAX_BUF, (int ()(const void , const void *)) std::strcmp);	706	qsort (skills, num_skills_found, MAX_BUF, (int ()(const void , const void *)) std::strcmp);
768		707
769	for (i = 0; i < num_skills_found; i++)	708	for (i = 0; i < num_skills_found; i++)
…		…
782	* direction that the user is facing. Returns false if we are unable to	721	* direction that the user is facing. Returns false if we are unable to
783	* change to the requested skill, or were unable to use the skill properly.	722	* change to the requested skill, or were unable to use the skill properly.
784	* This is tricky because skills can have spaces. We basically roll	723	* This is tricky because skills can have spaces. We basically roll
785	* our own find_skill_by_name so we can try to do better string matching.	724	* our own find_skill_by_name so we can try to do better string matching.
786	*/	725	*/
787
788	int	726	int
789	use_skill (object op, const char string)	727	use_skill (object op, const char string)
790	{	728	{
791	object *skop;	729	object *skop;
792	size_t len;	730	size_t len;
793		731
794	if (!string)	732	if (!string)
795	return 0;	733	return 0;
796		734
797	for (skop = op->inv; skop != NULL; skop = skop->below)	735	for (skop = op->inv; skop; skop = skop->below)
798	{	736	{
		737	if (skop->type == SKILL
799	if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) &&	738	&& QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
800	!strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))	739	&& !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
801	break;	740	break;
		741	else if (skop->type == SKILL_TOOL
802	else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))	742	&& !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
803	break;	743	break;
804	}	744	}
		745
805	if (!skop)	746	if (!skop)
806	{	747	{
807	new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);	748	new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);
808	return 0;	749	return 0;
809	}	750	}
…		…
814	* options given to the skill. Its pretty simple - if there	755	* options given to the skill. Its pretty simple - if there
815	* are extra parameters (as deteremined by string length), we	756	* are extra parameters (as deteremined by string length), we
816	* want to skip over any leading spaces.	757	* want to skip over any leading spaces.
817	*/	758	*/
818	if (len >= strlen (string))	759	if (len >= strlen (string))
819	{
820	string = NULL;	760	string = NULL;
821	}
822	else	761	else
823	{	762	{
824	string += len;	763	string += len;
825	while (*string == 0x20)	764	while (*string == 0x20)
826	string++;	765	string++;
		766
827	if (strlen (string) == 0)	767	if (strlen (string) == 0)
828	string = NULL;	768	string = NULL;
829	}	769	}
830		770
831	#ifdef SKILL_UTIL_DEBUG	771	#ifdef SKILL_UTIL_DEBUG
832	LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");	772	LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
833	#endif	773	#endif
834		774
835	/* Change to the new skill, then execute it. */
836	if (do_skill (op, op, skop, op->facing, string))	775	if (do_skill (op, op, skop, op->facing, string))
837	return 1;	776	return 1;
838		777
839	return 0;	778	return 0;
840	}	779	}
…		…
887	for (tmp = op->inv; tmp; tmp = tmp->below)	826	for (tmp = op->inv; tmp; tmp = tmp->below)
888	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))	827	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
889	break;	828	break;
890		829
891	if (!tmp)	830	if (!tmp)
892	{
893	LOG (llevError, "Could not find applied weapon on %s\n", &op->name);	831	LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
894	return 0;
895	}
896		832
897	change_skill (op, find_skill_by_name (op, tmp->skill), 1);	833	pl->combat_ob = tmp;
898	}	834	}
899	else	835
		836	if (!pl->combat_ob)
900	{	837	{
901	if (!skill)	838	if (!skill)
902	{	839	{
903	/* See if the players chosen skill is a combat skill, and use	840	/* See if the players chosen skill is a combat skill, and use
904	* it if appropriate.	841	* it if appropriate.
…		…
908	else	845	else
909	{	846	{
910	skill = find_player_hth_skill (op);	847	skill = find_player_hth_skill (op);
911		848
912	if (!skill)	849	if (!skill)
913	{
914	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");	850	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
915	return 0;
916	}
917	}	851	}
918	}	852	}
919		853
920	/* now try to ready the new skill */	854	if (skill)
921	if (!change_skill (op, skill, 0))	855	{
922	{ /* oh oh, trouble! */	856	op->change_skill (0);
923	new_draw_info_format (NDI_UNIQUE, 0, op, "Couldn't change to skill %s", &skill->name);	857	apply_special (op, skill, AP_APPLY);
924	return 0;
925	}	858	}
926	}	859	}
927		860
928	if (!pl->combat_ob)	861	if (!pl->combat_ob)
929	{	862	{
930	LOG (llevError, "Could not find anything to attack on %s\n", &op->name);	863	LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
931	return 0;	864	return 0;
932	}	865	}
933	}	866	}
934		867
935	if (op->current_weapon != pl->combat_ob)	868	if (!op->change_weapon (pl->combat_ob))
936	{	869	return 0;
937	op->current_weapon = pl->combat_ob;
938	new_draw_info_format (NDI_UNIQUE, 0, op, "You switch to your %s.", &op->current_weapon->name);
939	op->update_stats ();
940	}
941		870
942	/* lose invisiblity/hiding status for running attacks */	871	/* lose invisiblity/hiding status for running attacks */
943
944	if (pl->tmp_invis)	872	if (pl->tmp_invis)
945	{	873	{
946	pl->tmp_invis = 0;	874	pl->tmp_invis = 0;
947	op->invisible = 0;	875	op->invisible = 0;
948	op->hide = 0;	876	op->hide = 0;
…		…
1080		1008
1081	return 0;	1009	return 0;
1082	}	1010	}
1083		1011
1084	return skill_attack (NULL, op, dir, string, skill);	1012	return skill_attack (NULL, op, dir, string, skill);
1085
1086	}	1013	}
		1014

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.37 by root, Thu May 3 09:39:56 2007 UTC vs. Revision 1.61 by root, Tue May 6 16:32:34 2008 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.37 by root, Thu May 3 09:39:56 2007 UTC vs.
Revision 1.61 by root, Tue May 6 16:32:34 2008 UTC