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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.9 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.53 by root, Fri May 18 12:13:03 2007 UTC

…		…
1
2	/*	1	/*
3	* static char *rcsid_skill_util_c =
4	* "$Id: skill_util.C,v 1.9 2006/09/10 15:59:57 root Exp $";
5	*/
6
7	/*
8	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
9		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
10	Copryight (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copryight (C) 2002 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
12		7	*
13	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
14	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
15	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
16	(at your option) any later version.	11	* (at your option) any later version.
17		12	*
18	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,
19	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
20	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21	GNU General Public License for more details.	16	* GNU General Public License for more details.
22		17	*
23	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
24	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		21	*
27	The author can be reached via e-mail to crossfire-devel@real-time.com	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
28	*/	23	*/
29		24
30	/* 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. */
31		26
32	/* Reconfigured skills code to allow linking of skills to experience	27	/* Reconfigured skills code to allow linking of skills to experience
33	* 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.
43		38
44	/* define the following for skills utility debuging */	39	/* define the following for skills utility debuging */
45		40
46	/* #define SKILL_UTIL_DEBUG */	41	/* #define SKILL_UTIL_DEBUG */
47		42
48	#define WANT_UNARMED_SKILLS
49
50	#include <global.h>	43	#include <global.h>
51	#include <object.h>	44	#include <object.h>
52	#ifndef __CEXTRACT__
53	# include <sproto.h>	45	#include <sproto.h>
54	#endif
55	#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. */
56	#include <spells.h>	47	#include <spells.h>
57		48
		49	const uint8_t skill_flags[NUM_SKILLS] = {
		50	0, // SK_NONE
		51	# define def(uc, flags) flags,
		52	# include "skillinc.h"
		53	# undef def
		54	};
		55
58	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);
59	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);
60
61	shstr skill_names[NUM_SKILLS];
62		58
63	/* init_skills basically just sets up the skill_names table	59	/* init_skills basically just sets up the skill_names table
64	* above. The index into the array is set up by the	60	* above. The index into the array is set up by the
65	* subtypes.	61	* subtypes.
66	*/	62	*/
67	void	63	void
68	init_skills (void)	64	init_skills (void)
69	{	65	{
70	int i;
71	archetype *at;
72
73	for (at = first_archetype; at != NULL; at = at->next)	66	for (archetype *at = first_archetype; at; at = at->next)
74	{
75	if (at->clone.type == SKILL)	67	if (at->clone.type == SKILL)
76	{	68	{
77	if (skill_names[at->clone.subtype] != NULL)	69	if (skill_names[at->clone.subtype])
78	{
79	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",
80	at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill);	71	at->clone.subtype, &skill_names[at->clone.subtype], &at->clone.skill);
81	}
82	else	72	else
83	{
84	skill_names[at->clone.subtype] = at->clone.skill;	73	skill_names[at->clone.subtype] = at->clone.skill;
85	}
86	}	74	}
87	}
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	if (!skill)
245	{
246	skill = give_skill_by_name (who, skill_tool->skill);
247	link_player_skills (who);
248	}
249	return skill;	199	return skop;
250	}	200
251	return NULL;	201	return 0;
252	}	202	}
253		203
254	/* This changes the objects skill to new_skill.	204	/* This changes the objects chosen_skill to new_skill.
255	* note that this function doesn't always need to get used -
256	* you can now add skill exp to the player without the chosen_skill being
257	* set. This function is of most interest to players to update
258	* the various range information.
259	* if new_skill is null, this just unapplies the skill.
260	* flag has the current meaning:
261	* 0x1: If set, don't update the range pointer. This is useful when we
262	* need to ready a new skill, but don't want to clobber range.
263	* return 1 on success, 0 on error	205	* return 1 on success, 0 on error
264	*/	206	*/
265		207	bool
266	int	208	object::change_skill (object *new_skill)
267	change_skill (object who, object new_skill, int flag)
268	{	209	{
269	int old_range;
270
271	if (who->type != PLAYER)	210	if (type != PLAYER)
272	return 0;	211	return 0;
273		212
274	old_range = who->contr->shoottype;	213	// optimise this supposedly common case
275		214	if (new_skill == chosen_skill)
276	if (who->chosen_skill && who->chosen_skill == new_skill)
277	{
278	/* optimization for changing skill to current skill */
279	if (who->type == PLAYER && !(flag & 0x1))
280	who->contr->shoottype = range_skill;
281	return 1;	215	return 1;
282	}
283		216
284	if (!new_skill \|\| who->chosen_skill)
285	if (who->chosen_skill)	217	if (chosen_skill)
286	apply_special (who, who->chosen_skill, AP_UNAPPLY);
287
288	/* Only goal in this case was to unapply a skill */
289	if (!new_skill)
290	return 0;
291
292	if (apply_special (who, new_skill, AP_APPLY))
293	{
294	return 0;
295	}	218	{
296	if (flag & 0x1)	219	chosen_skill->flag [FLAG_APPLIED] = false;
297	who->contr->shoottype = (rangetype) old_range;	220	change_abil (this, chosen_skill);
		221	}
298		222
		223	chosen_skill = new_skill;
		224
		225	if (chosen_skill)
		226	{
		227	chosen_skill->flag [FLAG_APPLIED] = true;
		228	change_abil (this, chosen_skill);
		229	}
		230
		231	// always clear current weapon, as the selected skill could
		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;
		235
		236	update_stats ();
299	return 1;	237	return 1;
300	}
301
302	/* This function just clears the chosen_skill and range_skill values
303	* inthe player.
304	*/
305	void
306	clear_skill (object *who)
307	{
308	who->chosen_skill = NULL;
309	CLEAR_FLAG (who, FLAG_READY_SKILL);
310	if (who->type == PLAYER)
311	{
312	who->contr->ranges[range_skill] = NULL;
313	if (who->contr->shoottype == range_skill)
314	who->contr->shoottype = range_none;
315	}
316	}	238	}
317		239
318	/* 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().
319	* 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.
320	* 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
…		…
323	* 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
324	* 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
325	* give any exp for their direct use (eg, throwing).	247	* give any exp for their direct use (eg, throwing).
326	* It returns 0 if no skill was used.	248	* It returns 0 if no skill was used.
327	*/	249	*/
328
329	int	250	int
330	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)
331	{	252	{
332	int success = 0, exp = 0;	253	int success = 0, exp = 0;
333	int did_alc = 0;	254	int did_alc = 0;
334	object tmp, next;
335		255
336	if (!skill)	256	if (!skill)
337	return 0;	257	return 0;
338		258
339	/* 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
…		…
341	* 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
342	* the player doesn't have a bucket for that, create one.	262	* the player doesn't have a bucket for that, create one.
343	*/	263	*/
344	if (skill->type != SKILL && op->type == PLAYER)	264	if (skill->type != SKILL && op->type == PLAYER)
345	{	265	{
346	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	266	for (object *tmp = op->inv; tmp; tmp = tmp->below)
347	{
348	if (tmp->type == SKILL && tmp->skill == skill->skill)	267	if (tmp->type == SKILL && tmp->skill == skill->skill)
349	break;	268	{
		269	skill = tmp;
		270	goto found;
350	}	271	}
351	if (!tmp)	272
352	tmp = give_skill_by_name (op, skill->skill);	273	skill = give_skill_by_name (op, skill->skill);
353	skill = tmp;	274	found: ;
354	}	275	}
355		276
356	// skill, by_whom, on_which_object, which direction, skill_argument	277	// skill, by_whom, on_which_object, which direction, skill_argument
357	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)))
358	return 0;	279	return 0;
359		280
360	switch (skill->subtype)	281	switch (skill->subtype)
361	{	282	{
362	case SK_LEVITATION:	283	case SK_LEVITATION:
363	/* Not 100% sure if this will work with new movement code -	284	/* Not 100% sure if this will work with new movement code -
364	* the levitation skill has move_type for flying, so when	285	* the levitation skill has move_type for flying, so when
365	* equipped, that should transfer to player, when not,	286	* equipped, that should transfer to player, when not,
366	* shouldn't.	287	* shouldn't.
367	*/	288	*/
368	if (QUERY_FLAG (skill, FLAG_APPLIED))	289	if (QUERY_FLAG (skill, FLAG_APPLIED))
369	{	290	{
370	CLEAR_FLAG (skill, FLAG_APPLIED);	291	CLEAR_FLAG (skill, FLAG_APPLIED);
371	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");	292	new_draw_info (NDI_UNIQUE, 0, op, "You come to earth.");
372	}	293	}
373	else	294	else
374	{	295	{
375	SET_FLAG (skill, FLAG_APPLIED);	296	SET_FLAG (skill, FLAG_APPLIED);
376	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!.");
377	}	298	}
378	fix_player (op);	299
		300	op->update_stats ();
379	success = 1;	301	success = 1;
380	break;	302	break;
381		303
382	case SK_STEALING:	304	case SK_STEALING:
383	exp = success = steal (op, dir, skill);	305	exp = success = steal (op, dir, skill);
384	break;	306	break;
385		307
386	case SK_LOCKPICKING:	308	case SK_LOCKPICKING:
387	exp = success = pick_lock (op, dir, skill);	309	exp = success = pick_lock (op, dir, skill);
388	break;	310	break;
389		311
390	case SK_HIDING:	312	case SK_HIDING:
391	exp = success = hide (op, skill);	313	exp = success = hide (op, skill);
392	break;	314	break;
393		315
394	case SK_JUMPING:	316	case SK_JUMPING:
395	success = jump (op, dir, skill);	317	success = jump (op, dir, skill);
396	break;	318	break;
397		319
398	case SK_INSCRIPTION:	320	case SK_INSCRIPTION:
399	exp = success = write_on_item (op, string, skill);	321	exp = success = write_on_item (op, string, skill);
400	break;	322	break;
401		323
402	case SK_MEDITATION:	324	case SK_MEDITATION:
403	meditate (op, skill);	325	meditate (op, skill);
404	success = 1;	326	success = 1;
405	break;	327	break;
406	/* note that the following 'attack' skills gain exp through hit_player() */	328	/* note that the following 'attack' skills gain exp through hit_player() */
407		329
408	case SK_KARATE:	330	case SK_KARATE:
409	(void) attack_hth (op, dir, "karate-chopped", skill);	331	attack_hth (op, dir, "karate-chopped", skill);
410	break;	332	break;
411		333
412	case SK_PUNCHING:	334	case SK_PUNCHING:
413	(void) attack_hth (op, dir, "punched", skill);	335	attack_hth (op, dir, "punched", skill);
414	break;	336	break;
415		337
416	case SK_FLAME_TOUCH:	338	case SK_FLAME_TOUCH:
417	(void) attack_hth (op, dir, "flamed", skill);	339	attack_hth (op, dir, "flamed", skill);
418	break;	340	break;
419		341
420	case SK_SPARK_TOUCH:	342	case SK_SPARK_TOUCH:
421	(void) attack_hth (op, dir, "zapped", skill);	343	attack_hth (op, dir, "zapped", skill);
422	break;	344	break;
423		345
424	case SK_SHIVER:	346	case SK_SHIVER:
425	(void) attack_hth (op, dir, "froze", skill);	347	attack_hth (op, dir, "froze", skill);
426	break;	348	break;
427		349
428	case SK_ACID_SPLASH:	350	case SK_ACID_SPLASH:
429	(void) attack_hth (op, dir, "dissolved", skill);	351	attack_hth (op, dir, "dissolved", skill);
430	break;	352	break;
431		353
432	case SK_POISON_NAIL:	354	case SK_POISON_NAIL:
433	(void) attack_hth (op, dir, "injected poison into", skill);	355	attack_hth (op, dir, "injected poison into", skill);
434	break;	356	break;
435		357
436	case SK_CLAWING:	358	case SK_CLAWING:
437	(void) attack_hth (op, dir, "clawed", skill);	359	attack_hth (op, dir, "clawed", skill);
438	break;	360	break;
439		361
440	case SK_ONE_HANDED_WEAPON:	362	case SK_ONE_HANDED_WEAPON:
441	case SK_TWO_HANDED_WEAPON:	363	case SK_TWO_HANDED_WEAPON:
442	(void) attack_melee_weapon (op, dir, NULL, skill);	364	attack_melee_weapon (op, dir, NULL, skill);
443	break;	365	break;
444		366
445	case SK_FIND_TRAPS:	367	case SK_FIND_TRAPS:
446	exp = success = find_traps (op, skill);	368	exp = success = find_traps (op, skill);
447	break;	369	break;
448		370
449	case SK_SINGING:	371	case SK_SINGING:
450	exp = success = singing (op, dir, skill);	372	exp = success = singing (op, dir, skill);
451	break;	373	break;
452		374
453	case SK_ORATORY:	375	case SK_ORATORY:
454	exp = success = use_oratory (op, dir, skill);	376	exp = success = use_oratory (op, dir, skill);
455	break;	377	break;
456		378
457	case SK_SMITHERY:	379	case SK_SMITHERY:
458	case SK_BOWYER:	380	case SK_BOWYER:
459	case SK_JEWELER:	381	case SK_JEWELER:
460	case SK_ALCHEMY:	382	case SK_ALCHEMY:
461	case SK_THAUMATURGY:	383	case SK_THAUMATURGY:
462	case SK_LITERACY:	384	case SK_LITERACY:
463	case SK_WOODSMAN:	385	case SK_WOODSMAN:
464	/* 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.
465	* failing that, we go and identify stuff.	387	* failing that, we go and identify stuff.
466	*/	388	*/
467	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)
468	{	390	{
469	next = tmp->above;	391	next = tmp->above;
		392
470	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))	393	if (QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
471	{	394	{
472	attempt_do_alchemy (op, tmp);	395	attempt_do_alchemy (op, tmp);
		396
473	if (QUERY_FLAG (tmp, FLAG_APPLIED))	397	if (QUERY_FLAG (tmp, FLAG_APPLIED))
474	esrv_send_inventory (op, tmp);	398	esrv_send_inventory (op, tmp);
		399
475	did_alc = 1;	400	did_alc = 1;
476	}	401	}
477	}	402	}
		403
478	if (did_alc == 0)	404	if (did_alc == 0)
479	exp = success = skill_ident (op, skill);
480	break;
481
482	case SK_DET_MAGIC:
483	case SK_DET_CURSE:
484	exp = success = skill_ident (op, skill);	405	exp = success = skill_ident (op, skill);
		406
485	break;	407	break;
486		408
		409	case SK_DET_MAGIC:
		410	case SK_DET_CURSE:
		411	exp = success = skill_ident (op, skill);
		412	break;
		413
487	case SK_DISARM_TRAPS:	414	case SK_DISARM_TRAPS:
488	exp = success = remove_trap (op, dir, skill);	415	exp = success = remove_trap (op, dir, skill);
489	break;	416	break;
490		417
491	case SK_THROWING:	418	case SK_THROWING:
492	success = skill_throw (op, part, dir, string, skill);	419	success = skill_throw (op, part, dir, string, skill);
493	break;	420	break;
494		421
495	case SK_SET_TRAP:	422	case SK_SET_TRAP:
496	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.");
497	break;	424	break;
498		425
499	case SK_USE_MAGIC_ITEM:	426	case SK_USE_MAGIC_ITEM:
500	case SK_MISSILE_WEAPON:	427	case SK_MISSILE_WEAPON:
501	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.");
502	break;	429	break;
503		430
504	case SK_PRAYING:	431	case SK_PRAYING:
505	success = pray (op, skill);	432	success = pray (op, skill);
506	break;	433	break;
507		434
508	case SK_BARGAINING:	435	case SK_BARGAINING:
509	success = describe_shop (op);	436	success = describe_shop (op);
510	break;	437	break;
511		438
512	case SK_SORCERY:	439	case SK_SORCERY:
513	case SK_EVOCATION:	440	case SK_EVOCATION:
514	case SK_PYROMANCY:	441	case SK_PYROMANCY:
515	case SK_SUMMONING:	442	case SK_SUMMONING:
516	case SK_CLIMBING:	443	case SK_CLIMBING:
517	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.");
518	break;	445	break;
519		446
520	default:	447	default:
521	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);
522	break;	449	break;
523	}	450	}
524		451
525	/* 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.
526	* 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
527	* which use_monster_skill is called already simulates this.	454	* which use_monster_skill is called already simulates this.
528	* If certain skills should take more/less time, that should be	455	* If certain skills should take more/less time, that should be
529	* in the code for the skill itself.	456	* in the code for the skill itself.
530	*/	457	*/
531		458
532	if (op->type == PLAYER)	459	if (op->type == PLAYER)
533	op->speed_left -= 1.0;	460	op->speed_left -= 1.f;
534		461
535	/* 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.
536	* Note that add_exp() will figure out player/monster experience	463	* Note that add_exp() will figure out player/monster experience
537	* gain problems.	464	* gain problems.
538	*/	465	*/
…		…
566	* op is the object that was 'defeated'.	493	* op is the object that was 'defeated'.
567	* 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
568	* point back to who.	495	* point back to who.
569	*	496	*
570	*/	497	*/
571
572	int	498	int
573	calc_skill_exp (object who, object op, object *skill)	499	calc_skill_exp (object who, object op, object *skill)
574	{	500	{
575	int op_exp = 0, op_lvl = 0;	501	int op_exp = 0, op_lvl = 0;
576	float base, value, lvl_mult = 0.0;	502	float base, value, lvl_mult = 0.0;
…		…
665	* This one actually teaches the player the skill as something	591	* This one actually teaches the player the skill as something
666	* they can equip.	592	* they can equip.
667	* Return 0 if the player knows the skill, 1 if the	593	* Return 0 if the player knows the skill, 1 if the
668	* player learns the skill, 2 otherwise.	594	* player learns the skill, 2 otherwise.
669	*/	595	*/
670
671	int	596	int
672	learn_skill (object pl, object scroll)	597	learn_skill (object pl, object scroll)
673	{	598	{
674	object *tmp;
675
676	if (!scroll->skill)	599	if (!scroll->skill)
677	{	600	{
678	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);
679	return 2;	602	return 2;
680	}	603	}
681		604
682	/* can't use find_skill_by_name because we want skills the player knows	605	object *tmp = find_skill (pl, scroll->skill);
683	* but can't use natively.
684	*/
685
686	for (tmp = pl->inv; tmp != NULL; tmp = tmp->below)
687	if (tmp->type == SKILL && !strncasecmp (scroll->skill, tmp->skill, strlen (scroll->skill)))
688	break;
689		606
690	/* player already knows it */	607	/* player already knows it */
691	if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))	608	if (tmp && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
692	return 0;	609	return 0;
693
694
695		610
696	/* now a random change to learn, based on player Int.	611	/* now a random change to learn, based on player Int.
697	* give bonus based on level - otherwise stupid characters	612	* give bonus based on level - otherwise stupid characters
698	* might never be able to learn anything.	613	* might never be able to learn anything.
699	*/	614	*/
…		…
713	link_player_skills (pl);	628	link_player_skills (pl);
714	return 1;	629	return 1;
715	}	630	}
716		631
717	/* Gives a percentage clipped to 0% -> 100% of a/b. */	632	/* Gives a percentage clipped to 0% -> 100% of a/b. */
718
719	/* Probably belongs in some global utils-type file? */	633	/* Probably belongs in some global utils-type file? */
720	static int	634	static int
721	clipped_percent (sint64 a, sint64 b)	635	clipped_percent (sint64 a, sint64 b)
722	{	636	{
723	int rv;	637	int rv;
…		…
769	sprintf (buf, "%s%s", &tmp->name, periods);	683	sprintf (buf, "%s%s", &tmp->name, periods);
770	buf[40] = 0;	684	buf[40] = 0;
771		685
772	if (settings.permanent_exp_ratio)	686	if (settings.permanent_exp_ratio)
773	{	687	{
774	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%lld/%lld/%d%%)",	688	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 "/%d%%)",
775	buf, tmp->level,	689	buf, tmp->level, tmp->stats.exp,
776	(long long) tmp->stats.exp,
777	(long long) level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));	690	level_exp (tmp->level + 1, op->expmul), clipped_percent (tmp->perm_exp, tmp->stats.exp));
778	}	691	}
779	else	692	else
780	{	693	{
781	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%lld/%lld)",	694	sprintf (skills[num_skills_found++], "%slvl:%3d (xp:%" PRId64 "/%" PRId64 ")",
782	buf, tmp->level, (long long) tmp->stats.exp, (long long) level_exp (tmp->level + 1, op->expmul));	695	buf, tmp->level, tmp->stats.exp, level_exp (tmp->level + 1, op->expmul));
783	}	696	}
784	/* I don't know why some characters get a bunch of skills, but	697	/* I don't know why some characters get a bunch of skills, but
785	* it sometimes happens (maybe a leftover from bugier earlier code	698	* it sometimes happens (maybe a leftover from bugier earlier code
786	* and those character are still about). In any case, lets handle	699	* and those character are still about). In any case, lets handle
787	* it so it doesn't crash the server - otherwise, one character may	700	* it so it doesn't crash the server - otherwise, one character may
…		…
797	}	710	}
798		711
799	clear_win_info (op);	712	clear_win_info (op);
800	new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");	713	new_draw_info (NDI_UNIQUE, 0, op, "Player skills:");
801	if (num_skills_found > 1)	714	if (num_skills_found > 1)
802	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);
803		716
804	for (i = 0; i < num_skills_found; i++)	717	for (i = 0; i < num_skills_found; i++)
805	{
806	new_draw_info (NDI_UNIQUE, 0, op, skills[i]);	718	new_draw_info (NDI_UNIQUE, 0, op, skills[i]);
807	}
808		719
809	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);
810		721
811	cp = determine_god (op);	722	cp = determine_god (op);
812	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");
…		…
819	* 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
820	* 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.
821	* This is tricky because skills can have spaces. We basically roll	732	* This is tricky because skills can have spaces. We basically roll
822	* 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.
823	*/	734	*/
824
825	int	735	int
826	use_skill (object op, const char string)	736	use_skill (object op, const char string)
827	{	737	{
828	object *skop;	738	object *skop;
829	size_t len;	739	size_t len;
830		740
831	if (!string)	741	if (!string)
832	return 0;	742	return 0;
833		743
834	for (skop = op->inv; skop != NULL; skop = skop->below)	744	for (skop = op->inv; skop; skop = skop->below)
835	{	745	{
		746	if (skop->type == SKILL
836	if (skop->type == SKILL && QUERY_FLAG (skop, FLAG_CAN_USE_SKILL) &&	747	&& QUERY_FLAG (skop, FLAG_CAN_USE_SKILL)
837	!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))))
838	break;	749	break;
		750	else if (skop->type == SKILL_TOOL
839	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))))
840	break;	752	break;
841	}	753	}
		754
842	if (!skop)	755	if (!skop)
843	{	756	{
844	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);
845	return 0;	758	return 0;
846	}	759	}
…		…
851	* options given to the skill. Its pretty simple - if there	764	* options given to the skill. Its pretty simple - if there
852	* are extra parameters (as deteremined by string length), we	765	* are extra parameters (as deteremined by string length), we
853	* want to skip over any leading spaces.	766	* want to skip over any leading spaces.
854	*/	767	*/
855	if (len >= strlen (string))	768	if (len >= strlen (string))
856	{
857	string = NULL;	769	string = NULL;
858	}
859	else	770	else
860	{	771	{
861	string += len;	772	string += len;
862	while (*string == 0x20)	773	while (*string == 0x20)
863	string++;	774	string++;
		775
864	if (strlen (string) == 0)	776	if (strlen (string) == 0)
865	string = NULL;	777	string = NULL;
866	}	778	}
867		779
868	#ifdef SKILL_UTIL_DEBUG	780	#ifdef SKILL_UTIL_DEBUG
869	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");
870	#endif	782	#endif
871		783
872	/* Change to the new skill, then execute it. */
873	if (do_skill (op, op, skop, op->facing, string))	784	if (do_skill (op, op, skop, op->facing, string))
874	return 1;	785	return 1;
875		786
876	return 0;	787	return 0;
877	}	788	}
878		789
		790	static bool
		791	hth_skill_p (object *skill)
		792	{
		793	return (skill_flags [skill->subtype] & (SF_COMBAT \| SF_NEED_WEAPON)) == SF_COMBAT;
		794	}
879		795
880
881	/* This finds the best unarmed skill the player has, and returns	796	/* This finds the first unarmed skill the player has, and returns it.
882	* it. Best can vary a little - we consider clawing to always
883	* be the best for dragons.
884	* This could be more intelligent, eg, look at the skill level
885	* of the skill and go from there (eg, a level 40 puncher is
886	* is probably better than level 1 karate). OTOH, if you
887	* don't bother to set up your skill properly, that is the players
888	* problem (although, it might be nice to have a preferred skill
889	* field the player can set.
890	* Unlike the old code, we don't give out any skills - it is
891	* possible you just don't have any ability to get into unarmed
892	* combat. If everyone race/class should have one, this should
893	* be handled in the starting treasurelists, not in the code.
894	*/	797	*/
895	static object *	798	static object *
896	find_best_player_hth_skill (object *op)	799	find_player_hth_skill (object *op)
897	{	800	{
898	object tmp, best_skill = NULL;
899	int dragon = is_dragon_pl (op), last_skill = sizeof (unarmed_skills), i;
900
901	for (tmp = op->inv; tmp; tmp = tmp->below)	801	for (object *tmp = op->inv; tmp; tmp = tmp->below)
902	{	802	if (tmp->type == SKILL && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL) && hth_skill_p (tmp))
903	if (tmp->type == SKILL)
904	{
905	if (dragon && tmp->subtype == SK_CLAWING)
906	return tmp;	803	return tmp;
907		804
908	/* The order in the array is preferred order. So basically,	805	return 0;
909	* we just cut down the number to search - eg, if we find a skill
910	* early on in flame touch, then we only need to look into the unarmed_array
911	* to the entry before flame touch - don't care about the entries afterward,
912	* because they are infrerior skills.
913	* if we end up finding the best skill (i==0) might as well return
914	* right away - can't get any better than that.
915	*/
916	for (i = 0; i < last_skill; i++)
917	{
918	if (tmp->subtype == unarmed_skills[i] && QUERY_FLAG (tmp, FLAG_CAN_USE_SKILL))
919	{
920	best_skill = tmp;
921	last_skill = i;
922	if (i == 0)
923	return best_skill;
924	}
925	}
926	}
927	}
928	return best_skill;
929	}	806	}
930		807
931	/* do_skill_attack() - We have got an appropriate opponent from either	808	/* do_skill_attack() - We have got an appropriate opponent from either
932	* move_player_attack() or skill_attack(). In this part we get on with	809	* move_player_attack() or skill_attack(). In this part we get on with
933	* attacking, take care of messages from the attack and changes in invisible.	810	* attacking, take care of messages from the attack and changes in invisible.
…		…
935	* tmp is the targetted monster.	812	* tmp is the targetted monster.
936	* op is what is attacking	813	* op is what is attacking
937	* string is passed along to describe what messages to describe	814	* string is passed along to describe what messages to describe
938	* the damage.	815	* the damage.
939	*/	816	*/
940
941	static int	817	static int
942	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)
943	{	819	{
944	int success;
945
946	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)))
947	return RESULT_INT (0);	821	return RESULT_INT (0);
948		822
949	/* 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
950	* 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.
951	* 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,
952	* 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
953	* 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.
954	*/	828	*/
955	if (op->type == PLAYER)	829	if (player *pl = op->contr)
956	{	830	{
957	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))	831	if (!pl->combat_ob)
958	{	832	{
959	size_t i;	833	if (QUERY_FLAG (op, FLAG_READY_WEAPON))
960
961	if (!skill)
962	{	834	{
963	/* See if the players chosen skill is a combat skill, and use
964	* it if appropriate.
965	*/
966	if (op->chosen_skill)
967	{
968	for (i = 0; i < sizeof (unarmed_skills); i++)
969	if (op->chosen_skill->subtype == unarmed_skills[i])
970	{
971	skill = op->chosen_skill;
972	break;
973	}
974	}
975	/* If we didn't find a skill above, look harder for a good skill */
976	if (!skill)
977	{
978	skill = find_best_player_hth_skill (op);
979
980	if (!skill)
981	{
982	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
983	return 0;
984	}
985	}
986	}
987	if (skill != op->chosen_skill)
988	{
989	/* now try to ready the new skill */
990	if (!change_skill (op, skill, 0))
991	{ /* oh oh, trouble! */
992	new_draw_info_format (NDI_UNIQUE, 0, tmp, "Couldn't change to skill %s", &skill->name);
993	return 0;
994	}
995	}
996	}
997	else
998	{
999	/* Seen some crashes below where current_weapon is not set,
1000	* even though the flag says it is. So if current weapon isn't set,
1001	* do some work in trying to find the object to use.
1002	*/
1003	if (!op->current_weapon)
1004	{
1005	object *tmp;
1006
1007	LOG (llevError, "Player %s does not have current weapon set but flag_ready_weapon is set\n", &op->name);
1008	for (tmp = op->inv; tmp; tmp = tmp->below)	835	for (tmp = op->inv; tmp; tmp = tmp->below)
1009	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))	836	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_APPLIED))
1010	break;	837	break;
1011		838
1012	if (!tmp)	839	if (!tmp)
		840	LOG (llevError, "Could not find applied weapon on %s\n", &op->name);
		841
		842	pl->combat_ob = tmp;
		843	}
		844
		845	if (!pl->combat_ob)
		846	{
		847	if (!skill)
1013	{	848	{
1014	LOG (llevError, "Could not find applied weapon on %s\n", &op->name);	849	/* See if the players chosen skill is a combat skill, and use
1015	op->current_weapon = NULL;	850	* it if appropriate.
		851	*/
		852	if (op->chosen_skill && hth_skill_p (op->chosen_skill))
		853	skill = op->chosen_skill;
1016	return 0;	854	else
		855	{
		856	skill = find_player_hth_skill (op);
		857
		858	if (!skill)
		859	new_draw_info (NDI_BLACK, 0, op, "You have no unarmed combat skills!");
		860	}
1017	}	861	}
1018	else	862
1019	{	863	op->change_skill (0);
1020	op->current_weapon = tmp;	864	apply_special (op, skill, AP_APPLY);
1021	}
1022	}	865	}
1023		866
1024	/* Has ready weapon - make sure chosen_skill is set up properly */	867	if (!pl->combat_ob)
1025	if (!op->chosen_skill \|\| op->current_weapon->skill != op->chosen_skill->skill)
1026	{	868	{
1027	change_skill (op, find_skill_by_name (op, op->current_weapon->skill), 1);	869	LOG (llevError, "Could not find anything to attack on %s\n", &op->name);
		870	return 0;
1028	}	871	}
1029	}	872	}
1030	}
1031		873
		874	if (!op->change_weapon (pl->combat_ob))
		875	return 0;
		876
1032	/* lose invisiblity/hiding status for running attacks */	877	/* lose invisiblity/hiding status for running attacks */
1033		878	if (pl->tmp_invis)
1034	if (op->type == PLAYER && op->contr->tmp_invis)	879	{
1035	{
1036	op->contr->tmp_invis = 0;	880	pl->tmp_invis = 0;
1037	op->invisible = 0;	881	op->invisible = 0;
1038	op->hide = 0;	882	op->hide = 0;
1039	update_object (op, UP_OBJ_FACE);	883	update_object (op, UP_OBJ_CHANGE);
		884	}
1040	}	885	}
1041		886
1042	success = attack_ob (tmp, op);	887	int success = attack_ob (tmp, op);
1043		888
1044	/* print appropriate messages to the player */	889	/* print appropriate messages to the player */
1045		890
1046	if (success && string != NULL && tmp && !QUERY_FLAG (tmp, FLAG_FREED))	891	if (success && string && tmp && !QUERY_FLAG (tmp, FLAG_FREED))
1047	{	892	{
1048	if (op->type == PLAYER)	893	if (op->type == PLAYER)
1049	new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));	894	new_draw_info_format (NDI_UNIQUE, 0, op, "You %s %s!", string, query_name (tmp));
1050	else if (tmp->type == PLAYER)	895	else if (tmp->type == PLAYER)
1051	new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);	896	new_draw_info_format (NDI_UNIQUE, 0, tmp, "%s %s you!", query_name (op), string);
1052	}	897	}
		898
1053	return success;	899	return success;
1054	}	900	}
1055
1056		901
1057	/* skill_attack() - Core routine for use when we attack using a skills	902	/* skill_attack() - Core routine for use when we attack using a skills
1058	* system. In essence, this code handles	903	* system. In essence, this code handles
1059	* all skill-based attacks, ie hth, missile and melee weapons should be	904	* all skill-based attacks, ie hth, missile and melee weapons should be
1060	* treated here. If an opponent is already supplied by move_player(),	905	* treated here. If an opponent is already supplied by move_player(),
…		…
1063	*	908	*
1064	* This is called by move_player() and attack_hth()	909	* This is called by move_player() and attack_hth()
1065	*	910	*
1066	* Initial implementation by -bt thomas@astro.psu.edu	911	* Initial implementation by -bt thomas@astro.psu.edu
1067	*/	912	*/
1068
1069	int	913	int
1070	skill_attack (object tmp, object pl, int dir, const char string, object skill)	914	skill_attack (object tmp, object pl, int dir, const char string, object skill)
1071	{	915	{
1072	sint16 tx, ty;	916	sint16 tx, ty;
1073	mapstruct *m;	917	maptile *m;
1074	int mflags;	918	int mflags;
1075		919
1076	if (!dir)	920	if (!dir)
1077	dir = pl->facing;	921	dir = pl->facing;
		922
1078	tx = freearr_x[dir];	923	tx = freearr_x[dir];
1079	ty = freearr_y[dir];	924	ty = freearr_y[dir];
1080		925
1081	/* If we don't yet have an opponent, find if one exists, and attack.	926	/* If we don't yet have an opponent, find if one exists, and attack.
1082	* Legal opponents are the same as outlined in move_player_attack()	927	* Legal opponents are the same as outlined in move_player_attack()
1083	*/	928	*/
1084		929	if (!tmp)
1085	if (tmp == NULL)
1086	{	930	{
1087	m = pl->map;	931	m = pl->map;
1088	tx = pl->x + freearr_x[dir];	932	tx = pl->x + freearr_x[dir];
1089	ty = pl->y + freearr_y[dir];	933	ty = pl->y + freearr_y[dir];
1090		934
…		…
1094		938
1095	/* space must be blocked for there to be anything interesting to do */	939	/* space must be blocked for there to be anything interesting to do */
1096	if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))	940	if (!OB_TYPE_MOVE_BLOCK (pl, GET_MAP_MOVE_BLOCK (m, tx, ty)))
1097	return 0;	941	return 0;
1098		942
1099	for (tmp = get_map_ob (m, tx, ty); tmp; tmp = tmp->above)	943	for (tmp = GET_MAP_OB (m, tx, ty); tmp; tmp = tmp->above)
1100	if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| tmp->type == LOCKED_DOOR)	944	if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->stats.hp >= 0) \|\| QUERY_FLAG (tmp, FLAG_CAN_ROLL) \|\| tmp->type == LOCKED_DOOR)
1101	{	945	{
1102	/* Don't attack party members */	946	/* Don't attack party members */
1103	if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))	947	if ((pl->type == PLAYER && tmp->type == PLAYER) && (pl->contr->party != NULL && pl->contr->party == tmp->contr->party))
1104	return 0;	948	return 0;
		949
1105	break;	950	break;
1106	}	951	}
1107	}	952	}
		953
1108	if (!tmp)	954	if (!tmp)
1109	{	955	{
1110	if (pl->type == PLAYER)	956	if (pl->type == PLAYER)
1111	new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!");	957	new_draw_info (NDI_UNIQUE, 0, pl, "There is nothing to attack!");
		958
1112	return 0;	959	return 0;
1113	}	960	}
1114		961
1115	return do_skill_attack (tmp, pl, string, skill);	962	return do_skill_attack (tmp, pl, string, skill);
1116	}	963	}
1117
1118		964
1119	/* attack_hth() - this handles all hand-to-hand attacks -b.t. */	965	/* attack_hth() - this handles all hand-to-hand attacks -b.t. */
1120		966
1121	/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first	967	/* July 5, 1995 - I broke up attack_hth() into 2 parts. In the first
1122	* (attack_hth) we check for weapon use, etc in the second (the new	968	* (attack_hth) we check for weapon use, etc in the second (the new
1123	* function skill_attack() we actually attack.	969	* function skill_attack() we actually attack.
1124	*/	970	*/
1125
1126	static int	971	static int
1127	attack_hth (object pl, int dir, const char string, object *skill)	972	attack_hth (object pl, int dir, const char string, object *skill)
1128	{	973	{
1129	object enemy = NULL, weapon;	974	object enemy = NULL, weapon;
1130		975
…		…
1133	{	978	{
1134	if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED))	979	if (weapon->type == WEAPON && QUERY_FLAG (weapon, FLAG_APPLIED))
1135	{	980	{
1136	CLEAR_FLAG (weapon, FLAG_APPLIED);	981	CLEAR_FLAG (weapon, FLAG_APPLIED);
1137	CLEAR_FLAG (pl, FLAG_READY_WEAPON);	982	CLEAR_FLAG (pl, FLAG_READY_WEAPON);
1138	fix_player (pl);	983	pl->update_stats ();
1139	if (pl->type == PLAYER)	984	if (pl->type == PLAYER)
1140	{	985	{
1141	new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");	986	new_draw_info (NDI_UNIQUE, 0, pl, "You unwield your weapon in order to attack.");
1142	esrv_update_item (UPD_FLAGS, pl, weapon);	987	esrv_update_item (UPD_FLAGS, pl, weapon);
1143	}	988	}
		989
1144	break;	990	break;
1145	}	991	}
1146	}	992	}
		993
1147	return skill_attack (enemy, pl, dir, string, skill);	994	return skill_attack (enemy, pl, dir, string, skill);
1148	}	995	}
1149
1150		996
1151	/* attack_melee_weapon() - this handles melee weapon attacks -b.t.	997	/* attack_melee_weapon() - this handles melee weapon attacks -b.t.
1152	* For now we are just checking to see if we have a ready weapon here.	998	* For now we are just checking to see if we have a ready weapon here.
1153	* But there is a real neato possible feature of this scheme which	999	* But there is a real neato possible feature of this scheme which
1154	* bears mentioning:	1000	* bears mentioning:
1155	* Since we are only calling this from do_skill() in the future	1001	* Since we are only calling this from do_skill() in the future
1156	* we may make this routine handle 'special' melee weapons attacks	1002	* we may make this routine handle 'special' melee weapons attacks
1157	* (like disarming manuever with sai) based on player SK_level and	1003	* (like disarming manuever with sai) based on player SK_level and
1158	* weapon type.	1004	* weapon type.
1159	*/	1005	*/
1160
1161	static int	1006	static int
1162	attack_melee_weapon (object op, int dir, const char string, object *skill)	1007	attack_melee_weapon (object op, int dir, const char string, object *skill)
1163	{	1008	{
1164		1009
1165	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))	1010	if (!QUERY_FLAG (op, FLAG_READY_WEAPON))
1166	{	1011	{
1167	if (op->type == PLAYER)	1012	if (op->type == PLAYER)
1168	new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");	1013	new_draw_info (NDI_UNIQUE, 0, op, "You have no ready weapon to attack with!");
		1014
1169	return 0;	1015	return 0;
1170	}	1016	}
		1017
1171	return skill_attack (NULL, op, dir, string, skill);	1018	return skill_attack (NULL, op, dir, string, skill);
1172
1173	}	1019	}
		1020

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.9 by root, Sun Sep 10 15:59:57 2006 UTC vs. Revision 1.53 by root, Fri May 18 12:13:03 2007 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.9 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.53 by root, Fri May 18 12:13:03 2007 UTC