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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.22 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copryight (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
8	it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
9	the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
10	(at your option) any later version.	11	* option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
18	along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/* Created July 95 to separate skill utilities from actual skills -b.t. */	25	/* Created July 95 to separate skill utilities from actual skills -b.t. */
25		26
26	/* Reconfigured skills code to allow linking of skills to experience	27	/* Reconfigured skills code to allow linking of skills to experience
27	* categories. This is done solely through the init_new_exp_system() fctn.	28	* categories. This is done solely through the init_new_exp_system() fctn.
39		40
40	/* #define SKILL_UTIL_DEBUG */	41	/* #define SKILL_UTIL_DEBUG */
41		42
42	#include <global.h>	43	#include <global.h>
43	#include <object.h>	44	#include <object.h>
44	#ifndef __CEXTRACT__
45	# include <sproto.h>	45	#include <sproto.h>
46	#endif
47	#include <living.h> /* for defs of STR,CON,DEX,etc. -b.t. */	46	#include <living.h> /* for defs of STR,CON,DEX,etc. -b.t. */
48	#include <spells.h>	47	#include <spells.h>
49		48
50	/* Table of unarmed attack skills. Terminated by -1. This	49	const uint8_t skill_flags[NUM_SKILLS] = {
51	* is also the list that we should try to use skills when	50	0, // SK_NONE
52	* automatically applying one for the player.	51	# define def(uc, flags) flags,
53	*/	52	# include "skillinc.h"
54	static uint8 unarmed_skills[] = {	53	# undef def
55	SK_KARATE,
56	SK_CLAWING,
57	SK_FLAME_TOUCH,
58	SK_SPARK_TOUCH,
59	SK_SHIVER,
60	SK_ACID_SPLASH,
61	SK_POISON_NAIL,
62	SK_PUNCHING,
63	(uint8)-1
64	};	54	};
65		55
66	static int attack_hth (object pl, int dir, const char string, object *skill);	56	static int attack_hth (object pl, int dir, const char string, object *skill);
67	static int attack_melee_weapon (object op, int dir, const char string, object *skill);	57	static int attack_melee_weapon (object op, int dir, const char string, object *skill);
68		58
69	/* init_skills basically just sets up the skill_names table	59	/* init_skills basically just sets up the skill_names table
70	* above. The index into the array is set up by the	60	* above. The index into the array is set up by the
71	* subtypes.	61	* subtypes.
72	*/	62	*/
73	void	63	void
74	init_skills (void)	64	init_skills ()
75	{	65	{
76	int i;	66	for_all_archetypes (at)
77	archetype *at;
78
79	for (at = first_archetype; at != NULL; at = at->next)
80	if (at->clone.type == SKILL)	67	if (at->type == SKILL)
81	{	68	{
82	if (skill_names[at->clone.subtype] != NULL)	69	if (skill_names[at->subtype])
83	LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",	70	LOG (llevError, "init_skills: multiple skill using same subtype %d, %s, %s\n",
84	at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill);	71	at->subtype, &skill_names[at->subtype], &at->skill);
85	else	72	else
86	skill_names[at->clone.subtype] = at->clone.skill;	73	skill_names[at->subtype] = at->skill;
87	}	74	}
88		75
89	/* This isn't really an error if there is no skill subtype set, but	76	/* This isn't really an error if there is no skill subtype set, but
90	* checking for this may catch some user errors.	77	* checking for this may catch some user errors.
91	*/	78	*/
92	for (i = 1; i < NUM_SKILLS; i++)	79	for (int i = 1; i < NUM_SKILLS; i++)
93	{
94	if (!skill_names[i])	80	if (!skill_names[i])
95	LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);	81	LOG (llevError, "init_skills: skill subtype %d doesn't have a name?\n", i);
96	}
97	}	82	}
98		83
99	/* This function goes through the player inventory and sets	84	/* This function goes through the player inventory and sets
100	* up the last_skills[] array in the player object.	85	* up the last_skills[] array in the player object.
101	* the last_skills[] is used to more quickly lookup skills -	86	* the last_skills[] is used to more quickly lookup skills -
102	* mostly used for sending exp.	87	* mostly used for sending exp.
103	*/	88	*/
104	void	89	void
105	link_player_skills (object *op)	90	player::link_skills ()
106	{	91	{
107	object *tmp;	92	for (int i = 0; i < NUM_SKILLS; ++i)
		93	last_skill_ob [i] = 0;
108		94
109	for (tmp = op->inv; tmp; tmp = tmp->below)	95	for (object *tmp = ob->inv; tmp; tmp = tmp->below)
110	{
111	if (tmp->type == SKILL)	96	if (tmp->type == SKILL)
		97	{
		98	assert (IN_RANGE_EXC (tmp->subtype, 0, NUM_SKILLS));
		99
		100	if (last_skill_ob [tmp->subtype] != tmp)
112	{	101	{
113	/* This is really a warning, hence no else below */	102	/* This is really a warning, hence no else below */
114	if (op->contr->last_skill_ob[tmp->subtype] && op->contr->last_skill_ob[tmp->subtype] != tmp)	103	if (last_skill_ob [tmp->subtype])
115	{
116	LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",	104	LOG (llevError, "Multiple skills with the same subtype? %s, %s\n",
117	&op->contr->last_skill_ob[tmp->subtype]->skill, &tmp->skill);	105	&last_skill_ob [tmp->subtype]->skill, &tmp->skill);
		106
		107	last_skill_ob [tmp->subtype] = tmp;
		108	if (ns)
		109	ns->last_skill_exp [tmp->subtype] = -1;
118	}	110	}
119	if (tmp->subtype >= NUM_SKILLS)
120	{
121	LOG (llevError, "Invalid subtype number %d (range 0-%d)\n", tmp->subtype, NUM_SKILLS);
122	}
123	else
124	{
125	op->contr->last_skill_ob[tmp->subtype] = tmp;
126	op->contr->last_skill_exp[tmp->subtype] = -1;
127	}
128	}	111	}
129	}	112	}
		113
		114	static object *
		115	find_skill (object *who, shstr_cmp name)
		116	{
		117	if (who->chosen_skill
		118	&& who->chosen_skill->skill == name
		119	&& who->chosen_skill->type == SKILL)
		120	return who->chosen_skill;
		121
		122	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		123	if (tmp->skill == name && tmp->type == SKILL)
		124	return splay (tmp);
		125
		126	return 0;
		127	}
		128
		129	object *player::find_skill (shstr_cmp name) const
		130	{
		131	// might want to use last_skill_obj at one point, or maybe not
		132	return ::find_skill (ob, name);
130	}	133	}
131		134
132	/* This returns the skill pointer of the given name (the	135	/* This returns the skill pointer of the given name (the
133	* one that accumlates exp, has the level, etc).	136	* one that accumulates exp, has the level, etc).
134	*	137	*
135	* It is presumed that the player will be needing to actually	138	* It is presumed that the player will be needing to actually
136	* use the skill, so thus if use of the skill requires a skill	139	* use the skill, so thus if use of the skill requires a skill
137	* tool, this code will equip it.	140	* tool, this code will equip it.
138	*/	141	*/
139	object *	142	object *
140	find_skill_by_name (object who, const char name)	143	find_skill_by_name (object *who, shstr_cmp sh)
141	{	144	{
142	object skill = NULL, skill_tool = NULL, *tmp;	145	object *skill_tool = 0;
143		146
144	if (!name)
145	return NULL;
146
147	/* We make sure the length of the string in the object is greater
148	* in length than the passed string. Eg, if we have a skill called
149	* 'hi', we don't want to match if the user passed 'high'
150	*/
151	for (tmp = who->inv; tmp != NULL; tmp = tmp->below)	147	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		148	if (tmp->skill == sh)
152	{	149	{
153	if (tmp->type == SKILL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name))	150	if (tmp->type == SKILL && (tmp->flag [FLAG_CAN_USE_SKILL] \|\| tmp->flag [FLAG_APPLIED]))
154	skill = tmp;	151	/* If this is a skill that can be used without applying tool, return it */
155		152	return splay (tmp);
156	/* Try to find appropriate skilltool. If the player has one already	153	/* Try to find appropriate skilltool. If the player has one already
157	* applied, we try to keep using that one.	154	* applied, we try to keep using that one.
158	*/	155	*/
159	else if (tmp->type == SKILL_TOOL && !strncasecmp (name, tmp->skill, strlen (name)) && (size_t) strlen (tmp->skill) >= strlen (name))	156	else if (tmp->type == SKILL_TOOL && !skill_tool)
160	{
161	if (QUERY_FLAG (tmp, FLAG_APPLIED))
162	skill_tool = tmp;	157	skill_tool = tmp;
163	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))
164	skill_tool = tmp;
165	}	158	}
166	}	159
167	/* If this is a skill that can be used without a tool, return it */	160	if (!skill_tool)
168	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
169	return skill;	161	return 0;
170		162
171	/* Player has a tool to use the skill. IF not applied, apply it -	163	/* Player has a tool to use the skill. If not applied, apply it -
172	* if not successful, return null. If they do have the skill tool	164	* if not successful, return null. If they do have the skill tool
173	* but not the skill itself, give it to them.	165	* but not the skill itself, give it to them.
174	*/	166	*/
175	if (skill_tool)	167	object *skill = find_skill (who, skill_tool->skill);
176	{	168
177	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
178	{
179	if (apply_special (who, skill_tool, 0))
180	return NULL;
181	}
182	if (!skill)	169	if (!skill)
183	{
184	skill = give_skill_by_name (who, skill_tool->skill);	170	skill = give_skill_by_name (who, skill_tool->skill);
185	link_player_skills (who);	171
186	}	172	if (!skill_tool->flag [FLAG_APPLIED])
		173	if (!who->apply (splay (skill_tool)))
187	return skill;	174	return 0;
188	}	175
		176	return splay (skill);
		177	}
		178
		179	object *
		180	find_skill_by_name_fuzzy (object who, const char name)
		181	{
		182	if (name)
		183	for (object *tmp = who->inv; tmp; tmp = tmp->below)
		184	if ((tmp->type == SKILL \|\| tmp->type == SKILL_TOOL)
		185	&& tmp->skill.starts_with (name))
		186	if (object *skop = find_skill_by_name (who, tmp->skill))
		187	return skop;
		188
189	return NULL;	189	return 0;
190	}	190	}
191
192		191
193	/* This returns the skill pointer of the given name (the	192	/* This returns the skill pointer of the given name (the
194	* one that accumlates exp, has the level, etc).	193	* one that accumulates exp, has the level, etc).
195	*	194	*
196	* It is presumed that the player will be needing to actually	195	* It is presumed that the player will be needing to actually
197	* use the skill, so thus if use of the skill requires a skill	196	* use the skill, so thus if use of the skill requires a skill
198	* tool, this code will equip it.	197	* tool, this code will equip it.
199	*	198	*
…		…
202	* this replaces find_skill.	201	* this replaces find_skill.
203	*/	202	*/
204	object *	203	object *
205	find_skill_by_number (object *who, int skillno)	204	find_skill_by_number (object *who, int skillno)
206	{	205	{
207	object skill = NULL, skill_tool = NULL, *tmp;
208
209	if (skillno < 1 \|\| skillno >= NUM_SKILLS)
210	return NULL;
211
212	for (tmp = who->inv; tmp != NULL; tmp = tmp->below)	206	for (object *tmp = who->inv; tmp; tmp = tmp->below)
213	{
214	if (tmp->type == SKILL && tmp->subtype == skillno)	207	if (tmp->type == SKILL && tmp->subtype == skillno)
215	skill = tmp;	208	if (object *skop = find_skill_by_name (who, tmp->skill))
216
217	/* Try to find appropriate skilltool. If the player has one already
218	* applied, we try to keep using that one.
219	*/
220	else if (tmp->type == SKILL_TOOL && tmp->subtype == skillno)
221	{
222	if (QUERY_FLAG (tmp, FLAG_APPLIED))
223	skill_tool = tmp;
224	else if (!skill_tool \|\| !QUERY_FLAG (skill_tool, FLAG_APPLIED))
225	skill_tool = tmp;
226	}
227	}
228	/* If this is a skill that can be used without a tool, return it */
229	if (skill && QUERY_FLAG (skill, FLAG_CAN_USE_SKILL))
230	return skill;
231
232	/* Player has a tool to use the skill. IF not applied, apply it -
233	* if not successful, return null. If they do have the skill tool
234	* but not the skill itself, give it to them.
235	*/
236	if (skill_tool)
237	{
238	if (!QUERY_FLAG (skill_tool, FLAG_APPLIED))
239	{
240	if (apply_special (who, skill_tool, 0))
241	return NULL;
242	}
243
244	if (!skill)
245	{
246	skill = give_skill_by_name (who, skill_tool->skill);
247	link_player_skills (who);
248	}
249
250	return skill;	209	return skop;
251	}
252		210
253	return NULL;	211	return 0;
254	}	212	}
255		213
256	/* This changes the objects skill to new_skill.	214	/* This changes the objects chosen_skill to new_skill.
257	* note that this function doesn't always need to get used -
258	* you can now add skill exp to the player without the chosen_skill being
259	* set. This function is of most interest to players to update
260	* the various range information.
261	* if new_skill is null, this just unapplies the skill.
262	* flag has the current meaning:
263	* 0x1: If set, don't update the range pointer. This is useful when we
264	* need to ready a new skill, but don't want to clobber range.
265	* return 1 on success, 0 on error	215	* return 1 on success, 0 on error
266	*/	216	*/
267		217	bool
268	int	218	object::change_skill (object *new_skill)
269	change_skill (object who, object new_skill, int flag)
270	{	219	{
271	int old_range;
272
273	if (who->type != PLAYER)	220	if (type != PLAYER)
274	return 0;	221	return 0;
275		222
276	old_range = who->contr->shoottype;	223	// optimise this supposedly common case
277		224	if (new_skill == chosen_skill)
278	if (who->chosen_skill && who->chosen_skill == new_skill)
279	{
280	/* optimization for changing skill to current skill */
281	if (who->type == PLAYER && !(flag & 0x1))
282	who->contr->shoottype = range_skill;
283
284	return 1;	225	return 1;
285	}
286		226
287	// move skill to front, so it will be preferred next time
288	new_skill->remove ();
289	who->insert (new_skill);
290
291	if (!new_skill \|\| who->chosen_skill)
292	if (who->chosen_skill)	227	if (chosen_skill)
293	apply_special (who, who->chosen_skill, AP_UNAPPLY);	228	{
		229	chosen_skill->flag [FLAG_APPLIED] = false;
		230	change_abil (this, chosen_skill);
		231	}
294		232
295	/* Only goal in this case was to unapply a skill */	233	chosen_skill = new_skill;
		234
296	if (!new_skill)	235	if (chosen_skill)
297	return 0;	236	{
		237	chosen_skill->flag [FLAG_APPLIED] = true;
		238	change_abil (this, chosen_skill);
		239	}
298		240
299	if (apply_special (who, new_skill, AP_APPLY))	241	// always clear current weapon, as the selected skill could
300	return 0;	242	// conflict with the current weapon skill, which would go
		243	// undetected and exp would be given to the wrong skill.
		244	current_weapon = 0;
301		245
302	if (flag & 0x1)	246	update_stats ();
303	who->contr->shoottype = (rangetype)old_range;
304
305	return 1;	247	return 1;
306	}
307
308	/* This function just clears the chosen_skill and range_skill values
309	* inthe player.
310	*/
311	void
312	clear_skill (object *who)
313	{
314	who->chosen_skill = NULL;
315	CLEAR_FLAG (who, FLAG_READY_SKILL);
316	if (who->type == PLAYER)
317	{
318	who->contr->ranges[range_skill] = NULL;
319	if (who->contr->shoottype == range_skill)
320	who->contr->shoottype = range_none;
321	}
322	}	248	}
323		249
324	/* do_skill() - Main skills use function-similar in scope to cast_spell().	250	/* do_skill() - Main skills use function-similar in scope to cast_spell().
325	* We handle all requests for skill use outside of some combat here.	251	* We handle all requests for skill use outside of some combat here.
326	* We require a separate routine outside of fire() so as to allow monsters	252	* We require a separate routine outside of fire() so as to allow monsters
…		…
329	* exp - no caller needed that info, but it also prevented the callers	255	* exp - no caller needed that info, but it also prevented the callers
330	* from know if a skill was actually used, as many skills don't	256	* from know if a skill was actually used, as many skills don't
331	* give any exp for their direct use (eg, throwing).	257	* give any exp for their direct use (eg, throwing).
332	* It returns 0 if no skill was used.	258	* It returns 0 if no skill was used.
333	*/	259	*/
334
335	int	260	int
336	do_skill (object op, object part, object skill, int dir, const char string)	261	do_skill (object op, object part, object skill, int dir, const char string)
337	{	262	{
338	int success = 0, exp = 0;	263	int success = 0, exp = 0;
339	int did_alc = 0;
340	object tmp, next;
341		264
342	if (!skill)	265	if (!skill)
343	return 0;	266	return 0;
344		267
345	/* The code below presumes that the skill points to the object that	268	/* The code below presumes that the skill points to the object that
…		…
347	* go and try to find the actual real skill pointer, and if the	270	* go and try to find the actual real skill pointer, and if the
348	* the player doesn't have a bucket for that, create one.	271	* the player doesn't have a bucket for that, create one.
349	*/	272	*/
350	if (skill->type != SKILL && op->type == PLAYER)	273	if (skill->type != SKILL && op->type == PLAYER)
351	{	274	{
352	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	275	for (object *tmp = op->inv; tmp; tmp = tmp->below)
353	{
354	if (tmp->type == SKILL && tmp->skill == skill->skill)	276	if (tmp->type == SKILL && tmp->skill == skill->skill)
355	break;	277	{
		278	skill = tmp;
		279	goto found;
356	}	280	}
357	if (!tmp)	281
358	tmp = give_skill_by_name (op, skill->skill);	282	skill = give_skill_by_name (op, skill->skill);
359	skill = tmp;	283	found: ;
360	}	284	}
361		285
362	// skill, by_whom, on_which_object, which direction, skill_argument	286	// skill, by_whom, on_which_object, which direction, skill_argument
363	if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))	287	if (INVOKE_OBJECT (USE_SKILL, skill, ARG_OBJECT (op), ARG_OBJECT (part), ARG_INT (dir), ARG_STRING (string)))
364	return 0;	288	return 0;
365		289
366	switch (skill->subtype)	290	switch (skill->subtype)
367	{	291	{
368	case SK_LEVITATION:	292	case SK_LEVITATION:
369	/* Not 100% sure if this will work with new movement code -	293	/* Not 100% sure if this will work with new movement code -
370	* the levitation skill has move_type for flying, so when	294	* the levitation skill has move_type for flying, so when
371	* equipped, that should transfer to player, when not,	295	* equipped, that should transfer to player, when not,
372	* shouldn't.	296	* shouldn't.
373	*/	297	*/
374	if (QUERY_FLAG (skill, FLAG_APPLIED))	298	if (QUERY_FLAG (skill, FLAG_APPLIED))
375	{	299	{
376	CLEAR_FLAG (skill, FLAG_APPLIED);	300	CLEAR_FLAG (skill, FLAG_APPLIED);
377	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");	301	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
378	}	302	}
379	else	303	else
380	{	304	{
381	SET_FLAG (skill, FLAG_APPLIED);	305	SET_FLAG (skill, FLAG_APPLIED);
382	new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!.");	306	new_draw_info (NDI_UNIQUE, 0, op, "You rise into the air!");
383	}	307	}
		308
384	op->update_stats ();	309	op->update_stats ();
385	success = 1;	310	success = 1;
386	break;	311	break;
387		312
388	case SK_STEALING:	313	case SK_STEALING:
389	exp = success = steal (op, dir, skill);	314	exp = success = steal (op, dir, skill);
390	break;	315	break;
391		316
392	case SK_LOCKPICKING:	317	case SK_LOCKPICKING:
393	exp = success = pick_lock (op, dir, skill);	318	exp = success = pick_lock (op, dir, skill);
394	break;	319	break;
395		320
396	case SK_HIDING:	321	case SK_HIDING:
397	exp = success = hide (op, skill);	322	exp = success = hide (op, skill);
398	break;	323	break;
399		324
400	case SK_JUMPING:	325	case SK_JUMPING:
401	success = jump (op, dir, skill);	326	exp = success = jump (op, dir, skill);
402	break;	327	break;
403		328
404	case SK_INSCRIPTION:	329	case SK_INSCRIPTION:
405	exp = success = write_on_item (op, string, skill);	330	exp = success = write_on_item (op, string, skill);
406	break;	331	break;
407		332
408	case SK_MEDITATION:	333	case SK_MEDITATION:
409	meditate (op, skill);	334	meditate (op, skill);
410	success = 1;	335	success = 1;
411	break;	336	break;
412	/* note that the following 'attack' skills gain exp through hit_player() */	337	/* note that the following 'attack' skills gain exp through hit_player() */
413		338
414	case SK_KARATE:	339	case SK_KARATE:
415	(void) attack_hth (op, dir, "karate-chopped", skill);	340	attack_hth (op, dir, "karate-chopped", skill);
416	break;	341	break;
417		342
418	case SK_PUNCHING:	343	case SK_PUNCHING:
419	(void) attack_hth (op, dir, "punched", skill);	344	attack_hth (op, dir, "punched", skill);
420	break;	345	break;
421		346
422	case SK_FLAME_TOUCH:	347	case SK_FLAME_TOUCH:
423	(void) attack_hth (op, dir, "flamed", skill);	348	attack_hth (op, dir, "flamed", skill);
424	break;	349	break;
425		350
426	case SK_SPARK_TOUCH:	351	case SK_SPARK_TOUCH:
427	(void) attack_hth (op, dir, "zapped", skill);	352	attack_hth (op, dir, "zapped", skill);
428	break;	353	break;
429		354
430	case SK_SHIVER:	355	case SK_SHIVER:
431	(void) attack_hth (op, dir, "froze", skill);	356	attack_hth (op, dir, "froze", skill);
432	break;	357	break;
433		358
434	case SK_ACID_SPLASH:	359	case SK_ACID_SPLASH:
435	(void) attack_hth (op, dir, "dissolved", skill);	360	attack_hth (op, dir, "dissolved", skill);
436	break;	361	break;
437		362
438	case SK_POISON_NAIL:	363	case SK_POISON_NAIL:
439	(void) attack_hth (op, dir, "injected poison into", skill);	364	attack_hth (op, dir, "injected poison into", skill);
440	break;	365	break;
441		366
442	case SK_CLAWING:	367	case SK_CLAWING:
443	(void) attack_hth (op, dir, "clawed", skill);	368	attack_hth (op, dir, "clawed", skill);
444	break;	369	break;
445		370
446	case SK_ONE_HANDED_WEAPON:	371	case SK_ONE_HANDED_WEAPON:
447	case SK_TWO_HANDED_WEAPON:	372	case SK_TWO_HANDED_WEAPON:
448	(void) attack_melee_weapon (op, dir, NULL, skill);	373	attack_melee_weapon (op, dir, NULL, skill);
449	break;	374	break;
450		375
451	case SK_FIND_TRAPS:	376	case SK_FIND_TRAPS:
452	exp = success = find_traps (op, skill);	377	exp = success = find_traps (op, skill);
453	break;	378	break;
454		379
455	case SK_SINGING:	380	case SK_SINGING:
456	exp = success = singing (op, dir, skill);	381	exp = success = singing (op, dir, skill);
457	break;	382	break;
458		383
459	case SK_ORATORY:	384	case SK_ORATORY:
460	exp = success = use_oratory (op, dir, skill);	385	exp = success = use_oratory (op, dir, skill);
461	break;	386	break;
462		387
463	case SK_SMITHERY:	388	case SK_SMITHERY:
464	case SK_BOWYER:	389	case SK_BOWYER:
465	case SK_JEWELER:	390	case SK_JEWELER:
466	case SK_ALCHEMY:	391	case SK_ALCHEMY:
467	case SK_THAUMATURGY:	392	case SK_THAUMATURGY:
468	case SK_LITERACY:	393	case SK_LITERACY:
469	case SK_WOODSMAN:	394	case SK_WOODSMAN:
470	/* first, we try to find a cauldron, and do the alchemy thing.	395	/* first, we try to find a cauldron, and do the alchemy thing.
471	* failing that, we go and identify stuff.	396	* failing that, we go and identify stuff.
472	*/	397	*/
		398	{
		399	bool found_cauldron = false;
		400
473	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = next)	401	for (object next, tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = next)
474	{	402	{
475	next = tmp->above;	403	next = tmp->above;
476		404
477	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))	405	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
478	{	406	{
		407	found_cauldron = true;
		408
		409	if (tmp->skill != skill->skill)
		410	{
		411	op->failmsgf ("You can't use the %s with the %s skill!",
		412	query_name (tmp),
		413	query_name (skill));
		414	break;
		415	}
		416
479	attempt_do_alchemy (op, tmp);	417	attempt_do_alchemy (op, tmp, skill);
480		418
481	if (QUERY_FLAG (tmp, FLAG_APPLIED))	419	if (QUERY_FLAG (tmp, FLAG_APPLIED))
482	esrv_send_inventory (op, tmp);	420	esrv_send_inventory (op, tmp);
483
484	did_alc = 1;
485	}	421	}
486	}	422	}
487		423
488	if (did_alc == 0)	424	if (!found_cauldron)
489	exp = success = skill_ident (op, skill);	425	exp = success = skill_ident (op, skill);
490		426	}
491	break;	427	break;
492		428
493	case SK_DET_MAGIC:	429	case SK_DET_MAGIC:
494	case SK_DET_CURSE:	430	case SK_DET_CURSE:
495	exp = success = skill_ident (op, skill);	431	exp = success = skill_ident (op, skill);
496	break;	432	break;
497		433
498	case SK_DISARM_TRAPS:	434	case SK_DISARM_TRAPS:
499	exp = success = remove_trap (op, dir, skill);	435	exp = success = remove_trap (op, dir, skill);
500	break;	436	break;
501		437
502	case SK_THROWING:	438	case SK_THROWING:
503	success = skill_throw (op, part, dir, string, skill);	439	success = skill_throw (op, part, dir, string, skill);
504	break;	440	break;
505		441
506	case SK_SET_TRAP:	442	case SK_SET_TRAP:
507	new_draw_info (NDI_UNIQUE, 0, op, "This skill is not currently implemented.");	443	new_draw_info (NDI_UNIQUE, 0, op, "This skill is not currently implemented.");
508	break;	444	break;
509		445
510	case SK_USE_MAGIC_ITEM:	446	case SK_USE_MAGIC_ITEM:
511	case SK_MISSILE_WEAPON:	447	case SK_MISSILE_WEAPON:
512	new_draw_info (NDI_UNIQUE, 0, op, "There is no special attack for this skill.");	448	new_draw_info (NDI_UNIQUE, 0, op, "There is no special attack for this skill.");
513	break;	449	break;
514		450
515	case SK_PRAYING:	451	case SK_PRAYING:
516	success = pray (op, skill);	452	success = pray (op, skill);
517	break;	453	break;
518		454
519	case SK_BARGAINING:	455	case SK_BARGAINING:
520	success = describe_shop (op);	456	success = describe_shop (op);
521	break;	457	break;
522		458
523	case SK_SORCERY:	459	case SK_SORCERY:
524	case SK_EVOCATION:	460	case SK_EVOCATION:
525	case SK_PYROMANCY:	461	case SK_PYROMANCY:
526	case SK_SUMMONING:	462	case SK_SUMMONING:
527	case SK_CLIMBING:	463	case SK_CLIMBING:
528	new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");	464	new_draw_info (NDI_UNIQUE, 0, op, "This skill is already in effect.");
529	break;	465	break;
530		466
		467	case SK_MINING:
		468	success = skill_mining (op, part, skill, dir, string);
		469	break;
		470
		471	case SK_FISHING:
		472	success = skill_fishing (op, part, skill, dir, string);
		473	break;
		474
531	default:	475	default:
532	LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);	476	LOG (llevDebug, "%s attempted to use unknown skill: %d\n", query_name (op), op->chosen_skill->stats.sp);
533	break;	477	break;
534	}	478	}
535		479
536	/* For players we now update the speed_left from using the skill.	480	/* For players we now update the speed_left from using the skill.
537	* Monsters have no skill use time because of the random nature in	481	* Monsters have no skill use time because of the random nature in
538	* which use_monster_skill is called already simulates this.	482	* which use_monster_skill is called already simulates this.
539	* If certain skills should take more/less time, that should be	483	* If certain skills should take more/less time, that should be
540	* in the code for the skill itself.	484	* in the code for the skill itself.
541	*/	485	*/
542
543	if (op->type == PLAYER)	486	if (op->type == PLAYER)
544	op->speed_left -= 1.0;	487	op->speed_left -= 1.f;
545		488
546	/* this is a good place to add experience for successfull use of skills.	489	/* this is a good place to add experience for successfull use of skills.
547	* Note that add_exp() will figure out player/monster experience	490	* Note that add_exp() will figure out player/monster experience
548	* gain problems.	491	* gain problems.
549	*/	492	*/
…		…
577	* op is the object that was 'defeated'.	520	* op is the object that was 'defeated'.
578	* skill is the skill used. If no skill is used, it should just	521	* skill is the skill used. If no skill is used, it should just
579	* point back to who.	522	* point back to who.
580	*	523	*
581	*/	524	*/
582
583	int	525	int
584	calc_skill_exp (object who, object op, object *skill)	526	calc_skill_exp (object who, object op, object *skill)
585	{	527	{
586	int op_exp = 0, op_lvl = 0;	528	int op_exp = 0, op_lvl = 0;
587	float base, value, lvl_mult = 0.0;	529	float base, value, lvl_mult = 0.0;
…		…
596	* If an object is not alive and magical we set the base exp higher to	538	* If an object is not alive and magical we set the base exp higher to
597	* help out exp awards for skill_ident skills. Also, if	539	* help out exp awards for skill_ident skills. Also, if
598	* an item is type RUNE, we give out exp based on stats.Cha	540	* an item is type RUNE, we give out exp based on stats.Cha
599	* and level (this was the old system) -b.t.	541	* and level (this was the old system) -b.t.
600	*/	542	*/
601
602	if (!op)	543	if (!op)
603	{ /* no item/creature */	544	{ /* no item/creature */
604	op_lvl = who->map->difficulty < 1 ? 1 : who->map->difficulty;	545	op_lvl = max (1, who->map->difficulty);
605	op_exp = 0;	546	op_exp = 0;
606	}	547	}
607	else if (op->type == RUNE \|\| op->type == TRAP)	548	else if (op->type == RUNE \|\| op->type == TRAP)
608	{ /* all traps. If stats.Cha > 1 we use that	549	{ /* all traps. If stats.Cha > 1 we use that
609	* for the amount of experience */	550	* for the amount of experience */
…		…
613	else	554	else
614	{ /* all other items/living creatures */	555	{ /* all other items/living creatures */
615	op_exp = op->stats.exp;	556	op_exp = op->stats.exp;
616	op_lvl = op->level;	557	op_lvl = op->level;
617	if (!QUERY_FLAG (op, FLAG_ALIVE))	558	if (!QUERY_FLAG (op, FLAG_ALIVE))
618	{ /* for ident/make items */	559	op_lvl += 5 * abs (op->magic); /* for ident/make items */
619	op_lvl += 5 * abs (op->magic);
620	}
621	}	560	}
622		561
623	if (op_lvl < 1)	562	if (op_lvl < 1)
624	op_lvl = 1;	563	op_lvl = 1;
625		564
…		…
633	/* if skill really is a skill, then we can look at the skill archetype for	572	/* if skill really is a skill, then we can look at the skill archetype for
634	* bse reward value (exp) and level multiplier factor.	573	* bse reward value (exp) and level multiplier factor.
635	*/	574	*/
636	if (skill->type == SKILL)	575	if (skill->type == SKILL)
637	{	576	{
638	base += skill->arch->clone.stats.exp;	577	base += skill->arch->stats.exp;
639	if (settings.simple_exp)	578	if (settings.simple_exp)
640	{	579	{
641	if (skill->arch->clone.level)	580	if (skill->arch->level)
642	lvl_mult = (float) skill->arch->clone.level / 100.0;	581	lvl_mult = (float) skill->arch->level / 100.0;
643	else	582	else
644	lvl_mult = 1.0; /* no adjustment */	583	lvl_mult = 1.0; /* no adjustment */
645	}	584	}
646	else	585	else
647	{	586	{
648	if (skill->level)	587	if (skill->level)
649	lvl_mult = ((float) skill->arch->clone.level * (float) op_lvl) / ((float) skill->level * 100.0);	588	lvl_mult = ((float) skill->arch->level * (float) op_lvl) / ((float) skill->level * 100.0);
650	else	589	else
651	lvl_mult = 1.0;	590	lvl_mult = 1.0;
652	}	591	}
653	}	592	}
654	else	593	else
655	{	594	{
656	/* Don't divide by zero here! */	595	/* Don't divide by zero here! */
657	lvl_mult = (float) op_lvl / (float) (skill->level ? skill->level : 1);	596	lvl_mult = (float) op_lvl / (float) max (1, skill->level);
658	}	597	}
659	}	598	}
660		599
661	/* assemble the exp total, and return value */	600	/* assemble the exp total, and return value */
662		601
…		…
676	* This one actually teaches the player the skill as something	615	* This one actually teaches the player the skill as something
677	* they can equip.	616	* they can equip.
678	* Return 0 if the player knows the skill, 1 if the	617	* Return 0 if the player knows the skill, 1 if the
679	* player learns the skill, 2 otherwise.	618	* player learns the skill, 2 otherwise.
680	*/	619	*/
681
682	int	620	int
683	learn_skill (object pl, object scroll)	621	learn_skill (object pl, object scroll)
684	{	622	{
685	object *tmp;
686
687	if (!scroll->skill)	623	if (!scroll->skill)
688	{	624	{
689	LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);	625	LOG (llevError, "skill scroll %s does not have skill pointer set.\n", &scroll->name);
690	return 2;	626	return 2;
691	}	627	}
692		628
693	/* can't use find_skill_by_name because we want skills the player knows	629	object *tmp = find_skill (pl, scroll->skill);
694	* but can't use natively.
695	*/
696
697	for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
698	if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
699	break;
700		630
701	/* player already knows it */	631	/* player already knows it */
702	if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))	632	if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
703	return 0;	633	return 0;
704		634
…		…
717	LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);	647	LOG (llevError, "skill scroll %s does not have valid skill name (%s).\n", &scroll->name, &scroll->skill);
718	return 2;	648	return 2;
719	}	649	}
720		650
721	SET_FLAG (tmp, FLAG_CAN_USE_SKILL);	651	SET_FLAG (tmp, FLAG_CAN_USE_SKILL);
722	link_player_skills (pl);	652
723	return 1;	653	return 1;
724	}	654	}
725		655
726	/* Gives a percentage clipped to 0% -> 100% of a/b. */	656	/* Gives a percentage clipped to 0% -> 100% of a/b. */
727
728	/* Probably belongs in some global utils-type file? */	657	/* Probably belongs in some global utils-type file? */
729	static int	658	static int
730	clipped_percent (sint64 a, sint64 b)	659	clipped_percent (sint64 a, sint64 b)
731	{	660	{
732	int rv;	661	int rv;
…		…
752	* Note this function is a bit more complicated becauase we	681	* Note this function is a bit more complicated becauase we
753	* we want ot sort the skills before printing them. If we	682	* we want ot sort the skills before printing them. If we
754	* just dumped this as we found it, this would be a bit	683	* just dumped this as we found it, this would be a bit
755	* simpler.	684	* simpler.
756	*/	685	*/
757		686	//TODO: egad, do it in perl, do not suffer from the big buffer on stack, make it one single drawinfo.
758	void	687	void
759	show_skills (object op, const char search)	688	show_skills (object pl, const char search)
760	{	689	{
761	object *tmp = NULL;
762	char buf[MAX_BUF];
763	const char *cp;	690	const char *cp;
764	int i, num_skills_found = 0;	691	int i, num_skills_found = 0;
765	static const char *const periods = "........................................";	692	const char *const periods = ".............................."; // 30
766		693
767	/* Need to have a pointer and use strdup for qsort to work properly */	694	/* Need to have a pointer and use strdup for qsort to work properly */
768	char skills[NUM_SKILLS][MAX_BUF];	695	char skills[NUM_SKILLS][128]; // d'oh
769		696
		697	object *op = pl->contr->ob;
770		698
771	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	699	for (object *tmp = op->inv; tmp; tmp = tmp->below)
772	{	700	{
773	if (tmp->type == SKILL)	701	if (tmp->type == SKILL)
774	{	702	{
775	if (search && strstr (tmp->name, search) == NULL)	703	if (search && !tmp->name.contains (search))
776	continue;	704	continue;
		705
		706	char buf[30];
		707
777	/* Basically want to fill this out to 40 spaces with periods */	708	/* Basically want to fill this out to 30 spaces with periods */
778	sprintf (buf, "%s%s", &tmp->name, periods);	709	snprintf (buf, sizeof (buf), "%s%s", &tmp->name, periods);
779	buf[40] = 0;
780		710
781	if (settings.permanent_exp_ratio)	711	if (settings.permanent_exp_ratio)
782	{
783	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",	712	snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
784	buf, tmp->level, tmp->stats.exp,	713	buf, tmp->level, tmp->stats.exp,
785	level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));	714	level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
786	}
787	else	715	else
788	{
789	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",	716	snprintf (skills[num_skills_found++], sizeof (skills [0]), "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
790	buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));	717	buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
791	}	718
792	/* I don't know why some characters get a bunch of skills, but	719	/* I don't know why some characters get a bunch of skills, but
793	* it sometimes happens (maybe a leftover from bugier earlier code	720	* it sometimes happens (maybe a leftover from bugier earlier code
794	* and those character are still about). In any case, lets handle	721	* and those character are still about). In any case, lets handle
795	* it so it doesn't crash the server - otherwise, one character may	722	* it so it doesn't crash the server - otherwise, one character may
796	* crash the server numerous times.	723	* crash the server numerous times.
797	*/	724	*/
798	if (num_skills_found >= NUM_SKILLS)	725	if (num_skills_found >= NUM_SKILLS)
799	{	726	{
800	new_draw_info (NDI_RED, 0, op, "Your character has too many skills.");	727	new_draw_info (NDI_RED \| NDI_REPLY, 0, op, "Your character has too many skills.");
801	new_draw_info (NDI_RED, 0, op, "Something isn't right - contact the server admin");	728	new_draw_info (NDI_RED \| NDI_REPLY, 0, op, "Something isn't right - contact the server admin");
802	break;	729	break;
803	}	730	}
804	}	731	}
805	}	732	}
806		733
807	clear_win_info (op);	734	dynbuf_text &msg = msg_dynbuf; msg.clear ();
808	new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");	735
		736	msg << "T<Player skills:>\n\n";
809	if (num_skills_found > 1)	737	if (num_skills_found > 1)
810	qsort (skills, num_skills_found, MAX_BUF, (int ()(const void , const void *)) strcmp);	738	qsort (skills, num_skills_found, sizeof (skills [0]), (int ()(const void , const void *)) std::strcmp);
811		739
812	for (i = 0; i < num_skills_found; i++)	740	for (i = 0; i < num_skills_found; i++)
813	{	741	msg << " C<" << skills [i] << ">\n";
814	new_draw_info (NDI_UNIQUE, 0, op, skills[i]);
815	}
816		742
817	new_draw_info_format (NDI_UNIQUE, 0, op, "You can handle %d weapon improvements.", op->level / 5 + 5);	743	msg << "\nYou can handle " << op->level / 5 + 5 << " weapon improvements.\r";
818		744
819	cp = determine_god (op);	745	cp = determine_god (op);
820	new_draw_info_format (NDI_UNIQUE, 0, op, "You worship %s.", cp ? cp : "no god at current time");	746	msg << "You worship " << (cp ? cp : "no god at current time") << ".\r";
821		747
822	new_draw_info_format (NDI_UNIQUE, 0, op, "Your equipped item power is %d out of %d\n",	748	msg << "Your equipped item power is " << (int)op->contr->item_power
823	op->contr->item_power, (int) (op->level * settings.item_power_factor));	749	<< " out of " << int (op->level * settings.item_power_factor)
		750	<< ".\n";
		751
		752	pl->contr->infobox (MSG_CHANNEL ("skills"), msg);
824	}	753	}
825		754
826	/* use_skill() - similar to invoke command, it executes the skill in the	755	/* use_skill() - similar to invoke command, it executes the skill in the
827	* direction that the user is facing. Returns false if we are unable to	756	* direction that the user is facing. Returns false if we are unable to
828	* change to the requested skill, or were unable to use the skill properly.	757	* change to the requested skill, or were unable to use the skill properly.
829	* This is tricky because skills can have spaces. We basically roll	758	* This is tricky because skills can have spaces. We basically roll
830	* our own find_skill_by_name so we can try to do better string matching.	759	* our own find_skill_by_name so we can try to do better string matching.
831	*/	760	*/
832
833	int	761	int
834	use_skill (object op, const char string)	762	use_skill (object op, const char string)
835	{	763	{
836	object *skop;	764	object *skop;
837	size_t len;	765	size_t len;
838		766
839	if (!string)	767	if (!string)
840	return 0;	768	return 0;
841		769
842	for (skop = op->inv; skop != NULL; skop = skop->below)	770	for (skop = op->inv; skop; skop = skop->below)
843	{	771	if ((skop->type == SKILL \|\| skop->type == SKILL_TOOL)
844	if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) &&
845	!strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))	772	&& !strncmp (string, skop->skill, min (strlen (string), strlen (skop->skill))))
		773	{
		774	skop = find_skill_by_name (op, skop->skill);
846	break;	775	break;
847	else if (skop->type == SKILL_TOOL && !strncasecmp (string, skop->skill, MIN (strlen (string), (size_t) strlen (skop->skill))))
848	break;
849	}	776	}
		777
850	if (!skop)	778	if (!skop)
851	{	779	{
852	new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s", string);	780	op->failmsgf ("Unable to find skill %s.", string);
		781	return 0;
		782	}
		783
		784	if (!(skill_flags [skop->subtype] & SF_USE))
		785	{
		786	op->failmsgf (
		787	"You feel as if you wanted to do something funny, but you can't remember what. "
		788	"H<The %s skill cannot be C<use_skill>'ed - maybe you need to C<ready_skill> it, "
		789	"use it with some item, or it's always active.>",
		790	&skop->skill
		791	);
853	return 0;	792	return 0;
854	}	793	}
855		794
856	len = strlen (skop->skill);	795	len = strlen (skop->skill);
857		796
…		…
859	* options given to the skill. Its pretty simple - if there	798	* options given to the skill. Its pretty simple - if there
860	* are extra parameters (as deteremined by string length), we	799	* are extra parameters (as deteremined by string length), we
861	* want to skip over any leading spaces.	800	* want to skip over any leading spaces.
862	*/	801	*/
863	if (len >= strlen (string))	802	if (len >= strlen (string))
864	{
865	string = NULL;	803	string = NULL;
866	}
867	else	804	else
868	{	805	{
869	string += len;	806	string += len;
870	while (*string == 0x20)	807	while (*string == 0x20)
871	string++;	808	string++;
		809
872	if (strlen (string) == 0)	810	if (strlen (string) == 0)
873	string = NULL;	811	string = NULL;
874	}	812	}
875		813
876	#ifdef SKILL_UTIL_DEBUG	814	#ifdef SKILL_UTIL_DEBUG
877	LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");	815	LOG (llevDebug, "use_skill() got skill: %s\n", sknum > -1 ? skills[sknum].name : "none");
878	#endif	816	#endif
879		817
880	/* Change to the new skill, then execute it. */
881	if (do_skill (op, op, skop, op->facing, string))	818	if (do_skill (op, op, skop, op->facing, string))
882	return 1;	819	return 1;
883		820
884	return 0;	821	return 0;
885	}	822	}
886		823
887	static bool	824	static bool
888	hth_skill_p (object *skill)	825	hth_skill_p (object *skill)
889	{	826	{
890	for (unsigned int i = 0; i < sizeof (unarmed_skills); ++i)	827	return (skill_flags [skill->subtype] & (SF_COMBAT \| SF_NEED_ITEM)) == SF_COMBAT;
891	if (skill->subtype == unarmed_skills[i])
892	return 1;
893
894	return 0;
895	}	828	}
896		829
897	/* This finds the first unarmed skill the player has, and returns it.	830	/* This finds the first unarmed skill the player has, and returns it.
898	*/	831	*/
899	static object *	832	static object *
…		…
913	* tmp is the targetted monster.	846	* tmp is the targetted monster.
914	* op is what is attacking	847	* op is what is attacking
915	* string is passed along to describe what messages to describe	848	* string is passed along to describe what messages to describe
916	* the damage.	849	* the damage.
917	*/	850	*/
918
919	static int	851	static int
920	do_skill_attack (object tmp, object op, const char string, object skill)	852	do_skill_attack (object tmp, object op, const char string, object skill)
921	{	853	{
922	int success;
923
924	if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill)))	854	if (INVOKE_OBJECT (SKILL_ATTACK, op, ARG_OBJECT (tmp), ARG_STRING (string), ARG_OBJECT (skill)))
925	return RESULT_INT (0);	855	return RESULT_INT (0);
926		856
927	/* For Players only: if there is no ready weapon, and no "attack" skill	857	/* For Players only: if there is no ready weapon, and no "attack" skill
928	* is readied either then try to find a skill for the player to use.	858	* is readied either then try to find a skill for the player to use.
929	* it is presumed that if skill is set, it is a valid attack skill (eg,	859	* it is presumed that if skill is set, it is a valid attack skill (eg,
930	* the caller should have set it appropriately). We still want to pass	860	* the caller should have set it appropriately). We still want to pass
931	* through that code if skill is set to change to the skill.	861	* through that code if skill is set to change to the skill.
932	*/	862	*/
933	if (op->type == PLAYER)	863	if (player *pl = op->contr)
934	{	864	{
935	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))	865	if (skill)
936	{	866	{
937	if (!skill)	867	if (!op->apply (skill))
938	{
939	/* See if the players chosen skill is a combat skill, and use
940	* it if appropriate.
941	*/
942	if (op->chosen_skill && hth_skill_p (op->chosen_skill))
943	skill = op->chosen_skill;
944	else
945	{
946	skill = find_player_hth_skill (op);
947
948	if (!skill)
949	{
950	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
951	return 0;
952	}
953	}
954	}
955
956	/* now try to ready the new skill */
957	if (!change_skill (op, skill, 0))
958	{ /* oh oh, trouble! */
959	new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name);
960	return 0;	868	return 0;
961	}
962	}	869	}
963	else	870	else
964	{	871	{
965	/* Seen some crashes below where current_weapon is not set,	872	if (!pl->combat_ob)
966	* even though the flag says it is. So if current weapon isn't set,
967	* do some work in trying to find the object to use.
968	*/
969	if (!op->current_weapon)
970	{	873	{
971	object *tmp;	874	if (QUERY_FLAG (op, FLAG_READY_WEAPON))
972
973	LOG (llevError, "Player %s does not have current weapon set but flag_ready_weapon is set\n", &op->name);
974	for (tmp = op->inv; tmp; tmp = tmp->below)
975	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
976	break;
977
978	if (!tmp)
979	{	875	{
		876	for (tmp = op->inv; tmp; tmp = tmp->below)
		877	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
		878	break;
		879
		880	if (!tmp)
980	LOG (llevError, "Could not find applied weapon on %s\n", &op->name);	881	LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
981	op->current_weapon = NULL;	882
		883	pl->combat_ob = tmp;
		884	}
		885
		886	if (!pl->combat_ob)
		887	{
		888	/* See if the players chosen skill is a combat skill, and use
		889	* it if appropriate.
		890	*/
		891	if (op->chosen_skill && hth_skill_p (op->chosen_skill))
		892	skill = op->chosen_skill;
		893	else
		894	{
		895	skill = find_player_hth_skill (op);
		896
		897	if (!skill)
		898	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
		899	}
		900
		901	op->apply (skill);
		902	}
		903
		904	if (!pl->combat_ob)
		905	{
		906	LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
982	return 0;	907	return 0;
983	}	908	}
984	else
985	{
986	op->current_weapon = tmp;
987	}
988	}	909	}
989		910
990	change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1);	911	if (!op->apply (pl->combat_ob))
		912	return 0;
991	}	913	}
992	}
993		914
994	/* lose invisiblity/hiding status for running attacks */	915	/* lose invisiblity/hiding status for running attacks */
995		916	if (pl->tmp_invis)
996	if (op->type == PLAYER && op->contr->tmp_invis)	917	{
997	{
998	op->contr->tmp_invis = 0;	918	pl->tmp_invis = 0;
999	op->invisible = 0;	919	op->invisible = 0;
1000	op->hide = 0;	920	op->flag [FLAG_HIDDEN] = 0;
1001	update_object (op, UP_OBJ_FACE);	921	update_object (op, UP_OBJ_CHANGE);
		922	}
1002	}	923	}
1003		924
1004	success = attack_ob (tmp, op);	925	int success = attack_ob (tmp, op);
1005		926
1006	/* print appropriate messages to the player */	927	/* print appropriate messages to the player */
1007		928
1008	if (success && string != NULL && tmp && !QUERY_FLAG (tmp, FLAG_FREED))	929	if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED))
1009	{	930	{
1010	if (op->type == PLAYER)	931	if (op->type == PLAYER)
1011	new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));	932	new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
1012	else if (tmp->type == PLAYER)	933	else if (tmp->type == PLAYER)
1013	new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);	934	new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
1014	}	935	}
		936
1015	return success;	937	return success;
1016	}	938	}
1017
1018		939
1019	/* skill_attack() - Core routine for use when we attack using a skills	940	/* skill_attack() - Core routine for use when we attack using a skills
1020	* system. In essence, this code handles	941	* system. In essence, this code handles
1021	* all skill-based attacks, ie hth, missile and melee weapons should be	942	* all skill-based attacks, i.e. hth, missile and melee weapons should be
1022	* treated here. If an opponent is already supplied by move_player(),	943	* treated here. If an opponent is already supplied by move_player(),
1023	* we move right onto do_skill_attack(), otherwise we find if an	944	* we move right onto do_skill_attack(), otherwise we find if an
1024	* appropriate opponent exists.	945	* appropriate opponent exists.
1025	*	946	*
1026	* This is called by move_player() and attack_hth()	947	* This is called by move_player() and attack_hth()
1027	*	948	*
1028	* Initial implementation by -bt thomas@astro.psu.edu	949	* Initial implementation by -bt thomas@astro.psu.edu
1029	*/	950	*/
1030
1031	int	951	int
1032	skill_attack (object tmp, object pl, int dir, const char string, object skill)	952	skill_attack (object tmp, object pl, int dir, const char string, object skill)
1033	{	953	{
1034	sint16 tx, ty;	954	sint16 tx, ty;
1035	maptile *m;	955	maptile *m;
…		…
1042	ty = freearr_y[dir];	962	ty = freearr_y[dir];
1043		963
1044	/* If we don't yet have an opponent, find if one exists, and attack.	964	/* If we don't yet have an opponent, find if one exists, and attack.
1045	* Legal opponents are the same as outlined in move_player_attack()	965	* Legal opponents are the same as outlined in move_player_attack()
1046	*/	966	*/
1047		967	if (!tmp)
1048	if (tmp == NULL)
1049	{	968	{
1050	m = pl->map;	969	m = pl->map;
1051	tx = pl->x + freearr_x[dir];	970	tx = pl->x + freearr_x[dir];
1052	ty = pl->y + freearr_y[dir];	971	ty = pl->y + freearr_y[dir];
1053		972
…		…
1063	if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| tmp->type == LOCKED_DOOR)	982	if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| tmp->type == LOCKED_DOOR)
1064	{	983	{
1065	/* Don't attack party members */	984	/* Don't attack party members */
1066	if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))	985	if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
1067	return 0;	986	return 0;
		987
1068	break;	988	break;
1069	}	989	}
1070	}	990	}
		991
1071	if (!tmp)	992	if (!tmp)
1072	{	993	{
1073	if (pl->type == PLAYER)	994	if (pl->type == PLAYER)
1074	new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!");	995	new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!");
		996
1075	return 0;	997	return 0;
1076	}	998	}
1077		999
1078	return do_skill_attack (tmp, pl, string, skill);	1000	return do_skill_attack (tmp, pl, string, skill);
1079	}	1001	}
1080
1081		1002
1082	/* attack_hth() - this handles all hand-to-hand attacks -b.t. */	1003	/* attack_hth() - this handles all hand-to-hand attacks -b.t. */
1083		1004
1084	/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first	1005	/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first
1085	* (attack_hth) we check for weapon use, etc in the second (the new	1006	* (attack_hth) we check for weapon use, etc in the second (the new
1086	* function skill_attack() we actually attack.	1007	* function skill_attack() we actually attack.
1087	*/	1008	*/
1088
1089	static int	1009	static int
1090	attack_hth (object pl, int dir, const char string, object *skill)	1010	attack_hth (object pl, int dir, const char string, object *skill)
1091	{	1011	{
1092	object enemy = NULL, weapon;	1012	object enemy = NULL, weapon;
1093		1013
…		…
1102	if (pl->type == PLAYER)	1022	if (pl->type == PLAYER)
1103	{	1023	{
1104	new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");	1024	new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1105	esrv_update_item (UPD_FLAGS, pl, weapon);	1025	esrv_update_item (UPD_FLAGS, pl, weapon);
1106	}	1026	}
		1027
1107	break;	1028	break;
1108	}	1029	}
1109	}	1030	}
		1031
1110	return skill_attack (enemy, pl, dir, string, skill);	1032	return skill_attack (enemy, pl, dir, string, skill);
1111	}	1033	}
1112
1113		1034
1114	/* attack_melee_weapon() - this handles melee weapon attacks -b.t.	1035	/* attack_melee_weapon() - this handles melee weapon attacks -b.t.
1115	* For now we are just checking to see if we have a ready weapon here.	1036	* For now we are just checking to see if we have a ready weapon here.
1116	* But there is a real neato possible feature of this scheme which	1037	* But there is a real neato possible feature of this scheme which
1117	* bears mentioning:	1038	* bears mentioning:
1118	* Since we are only calling this from do_skill() in the future	1039	* Since we are only calling this from do_skill() in the future
1119	* we may make this routine handle 'special' melee weapons attacks	1040	* we may make this routine handle 'special' melee weapons attacks
1120	* (like disarming manuever with sai) based on player SK_level and	1041	* (like disarming manuever with sai) based on player SK_level and
1121	* weapon type.	1042	* weapon type.
1122	*/	1043	*/
1123
1124	static int	1044	static int
1125	attack_melee_weapon (object op, int dir, const char string, object *skill)	1045	attack_melee_weapon (object op, int dir, const char string, object *skill)
1126	{	1046	{
1127		1047
1128	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))	1048	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))
1129	{	1049	{
1130	if (op->type == PLAYER)	1050	if (op->type == PLAYER)
1131	new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");	1051	new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
		1052
1132	return 0;	1053	return 0;
1133	}	1054	}
		1055
1134	return skill_attack (NULL, op, dir, string, skill);	1056	return skill_attack (NULL, op, dir, string, skill);
1135
1136	}	1057	}
		1058

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.22 by root, Fri Dec 22 16:34:00 2006 UTC vs. Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.22 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.92 by root, Sat Apr 10 04:54:10 2010 UTC