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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.20 by root, Mon Dec 11 21:32:18 2006 UTC vs.
Revision 1.55 by root, Wed May 30 03:03:10 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.20 by root, Mon Dec 11 21:32:18 2006 UTC vs. Revision 1.55 by root, Wed May 30 03:03:10 2007 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.20 by root, Mon Dec 11 21:32:18 2006 UTC vs.
Revision 1.55 by root, Wed May 30 03:03:10 2007 UTC