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

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.24 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.59 by root, Thu Nov 8 19:43:28 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/server/skill_util.C (file contents): Revision 1.24 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs. Revision 1.59 by root, Thu Nov 8 19:43:28 2007 UTC

Diff Legend

Comparing deliantra/server/server/skill_util.C (file contents):
Revision 1.24 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.59 by root, Thu Nov 8 19:43:28 2007 UTC